[mate-system-monitor] 01/01: Reinstate and update 2001_omit-gfdl-licensed-help-files.patch. Correct a typo.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-system-monitor.

commit 5fb90d095ce4b3d2de9f006b4ccf8ba0a2abd2c5
Author: Martin Wimpress <code at flexion.org>
Date:   Thu Jun 11 14:30:19 2015 +0100

    Reinstate and update 2001_omit-gfdl-licensed-help-files.patch. Correct a typo.
---
 debian/changelog                                   |  3 +--
 .../2001_omit-gfdl-licensed-help-files.patch       | 27 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c8c2af..0ce1210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at flexion.org>  Tue, 09 Jun 2015 04:55:41 +0100
 
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
index 89ea15c..053182b 100644
--- a/debian/patches/2001_omit-gfdl-licensed-help-files.patch
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -1,22 +1,23 @@
 Description: Don't build non-DFSG (GFDL 1.1 licensed) help files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Author: Martin Wimpress <code at 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
- 
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-system-monitor.git