Ignore extra license file inside of GNOME help

diff --git a/debian/changelog b/debian/changelog
index 21cca59970b784d5f502bc6178a1f7aba649ce0e..65c32816299b5bbbf6f983c27209e7c75455c2de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ glabels (3.0.0-3) unstable; urgency=low
   * Remove broken man page symlink
   * Remove Replaces for glabels 2.0 transition
   * Depend on gnome-desktop-data for licenses in GNOME help
-  * New patch:
+  * New patches:
     - 0006-Fix-schema-references.patch
+    - 0007-Ignore-license.page.patch
 
  -- Jakob Haufe <sur5r@sur5r.net>  Mon, 09 Apr 2012 18:02:07 +0200
 

diff --git a/debian/patches/0007-Ignore-license.page.patch b/debian/patches/0007-Ignore-license.page.patch
new file mode 100644 (file)
index 0000000..5b4fdaf
--- /dev/null
+++ b/debian/patches/0007-Ignore-license.page.patch
@@ -0,0 +1,21 @@
+From: Jakob Haufe <sur5r@sur5r.net>
+Date: Mon, 9 Apr 2012 18:40:04 +0200
+Subject: Ignore license.page
+Forwarded: not-needed
+
+---
+ help/Makefile.am |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 1185a90..1427128 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -34,7 +34,6 @@ DOC_PAGES = \
+       editprop.page           \
+       index.page              \
+       labelprop.page          \
+-      license.page            \
+       mancreate.page          \
+       merge-ex1.page          \
+       merge-ex2.page          \

diff --git a/debian/patches/series b/debian/patches/series
index 379d448ef910657afecf64efd3b2c2cf1c9debe1..928570cd717eeb26f238d2fd8fc24b6a10882151 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-libglabels-silently-uses-gobject-fix-linkage.patch
 0005-Ignore-unused-screenshot.patch
 0006-Fix-schema-references.patch
+0007-Ignore-license.page.patch