New patch to get rid of unused screenshot

diff --git a/debian/patches/0005-Ignore-unused-screenshot.patch b/debian/patches/0005-Ignore-unused-screenshot.patch
new file mode 100644 (file)
index 0000000..35c2bbf
--- /dev/null
+++ b/debian/patches/0005-Ignore-unused-screenshot.patch
@@ -0,0 +1,24 @@
+From: Jakob Haufe <sur5r@sur5r.net>
+Date: Thu, 29 Mar 2012 22:20:26 +0200
+Subject: Ignore unused screenshot
+
+Ignore figures/main-window-empty.png as it's no longer used by the docs
+and generates a self-referencing symlink.
+
+This should go upstream
+---
+ help/Makefile.am |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 4177122..1185a90 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -11,7 +11,6 @@ DOC_FIGURES = \
+       figures/glabels-template-layout.png             \
+       figures/glabels-template-rect-label.png         \
+       figures/introduction-glabels-main-window.png    \
+-      figures/main-window-empty.png                   \
+       figures/merge-ex1-1.png                         \
+       figures/merge-ex1-2.png                         \
+       figures/merge-ex1-3.png                         \

diff --git a/debian/patches/series b/debian/patches/series
index 159c2ec6d88f7949e1844c0b8262bb4e3eb94bfd..253be628367348f55a08f0bd17c86d277c28d4f8 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-manpage.patch
 0003-libglbarcode-uses-pangocairo-not-plain-pango.patch
 0004-libglabels-silently-uses-gobject-fix-linkage.patch
+0005-Ignore-unused-screenshot.patch

diff --git a/debian/rules b/debian/rules
index d38603353e18dfc44c1e0c947bb666ea7be3953b..97ac5e636a7f5c7b552b299a2863d1854a1b88a7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,4 +26,5 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=-Wl,--as-needed
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp --list-missing
 
 post-patches::
+       automake
        autoconf