callisto-debian/mate-system-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reinstate and update 2001_omit-gfdl-licensed-help-files.patch. Correct a typo.

Browse Source
This commit is contained in:
Martin Wimpress
2015-06-11 14:30:19 +01:00
parent daffd9c7b2
commit 5fb90d095c
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -11,10 +11,9 @@ mate-system-monitor (1.10.0+dfsg1-1) UNRELEASED; urgency=low
+ Update copyright file after new upstream release.
* debian/patches:
+ Drop 1001_fix-name-section-in-man-page.patch. Applied upstream.
+ Drop 2001_omit-gfdl-licensed-help-files.patch. Applied upstream.
* debian/rules:
+ Add --enable-systemd because systemd is disabled by default.
+ Remov obsolete --disable-scrollkeeper.
+ Remove obsolete --disable-scrollkeeper.
-- Martin Wimpress <code@flexion.org> Tue, 09 Jun 2015 04:55:41 +0100

27
debian/patches/2001_omit-gfdl-licensed-help-files.patch vendored
View File

@ -1,22 +1,23 @@
Description: Don't build non-DFSG (GFDL 1.1 licensed) help files
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Author: Martin Wimpress <code@flexion.org>
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = pixmaps po src help
+SUBDIRS = pixmaps po src
man_MANS = mate-system-monitor.1
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,6 @@
@@ -126,7 +126,6 @@ Makefile
src/Makefile
pixmaps/Makefile
po/Makefile.in
-help/Makefile
mate-system-monitor.desktop.in
])
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = pixmaps po src help
+SUBDIRS = pixmaps po src
man_MANS = mate-system-monitor.1