From: Jakob Haufe Date: Fri, 16 Nov 2012 10:47:32 +0000 (+0100) Subject: Drop patches applied upstream X-Git-Tag: debian/3.0.1-1~4 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f79bd23f995bc3724b22206ea02f84ac702a99b;p=glabels Drop patches applied upstream These patches were applied upstream in the following commits: * f208a3c2bbb3075c13970c6795a528481ba3d506 * 840201bf140c77b6594485d478b6ee130c9c72e8 * 094183af76ff377062bcaa213b4aeee41c23f2ec --- diff --git a/debian/changelog b/debian/changelog index 14d5a085..ad6bd081 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ glabels (3.0.1-1) UNRELEASED; urgency=low * Enable hardening buildflags * Update watchfile as SF has no current versions anymore * New upstream version (Closes: #691958) + * Drop patches applied upstream: + - 0003-libglbarcode-uses-pangocairo-not-plain-pango.patch + - 0004-libglabels-silently-uses-gobject-fix-linkage.patch + - 0005-Ignore-unused-screenshot.patch + - 0006-Fix-schema-references.patch -- Jakob Haufe Fri, 16 Nov 2012 11:31:55 +0100 diff --git a/debian/patches/0003-libglbarcode-uses-pangocairo-not-plain-pango.patch b/debian/patches/0003-libglbarcode-uses-pangocairo-not-plain-pango.patch deleted file mode 100644 index 0d60ac26..00000000 --- a/debian/patches/0003-libglbarcode-uses-pangocairo-not-plain-pango.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Jakob Haufe -Date: Mon, 12 Mar 2012 00:44:57 +0100 -Subject: libglbarcode uses pangocairo, not plain pango -Bug: https://sourceforge.net/tracker/?func=detail&aid=3514704&group_id=46122&atid=445116 - -Only having pango here results in incomplete linkage and complaints by -dpkg-shlibdeps. ---- - configure.ac | 2 +- - libglbarcode/libglbarcode-3.0.pc.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ebcb0c4..ca2276d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -176,7 +176,7 @@ dnl --------------------------------------------------------------------------- - PKG_CHECK_MODULES(LIBGLBARCODE, [\ - glib-2.0 >= $GLIB_REQUIRED \ - cairo >= $CAIRO_REQUIRED \ -- pango >= $PANGO_REQUIRED \ -+ pangocairo >= $PANGO_REQUIRED \ - ]) - - AC_SUBST(LIBGLBARCODE_CFLAGS) -diff --git a/libglbarcode/libglbarcode-3.0.pc.in b/libglbarcode/libglbarcode-3.0.pc.in -index 325eff2..f621f14 100644 ---- a/libglbarcode/libglbarcode-3.0.pc.in -+++ b/libglbarcode/libglbarcode-3.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: LIBGLBARCODE - Description: GLabels Built-In Barcode Library --Requires: glib-2.0 cairo pango -+Requires: glib-2.0 cairo pangocairo - Version: @VERSION@ - Libs: -L${libdir} -lglbarcode-3.0 - Libs.private: -lm diff --git a/debian/patches/0004-libglabels-silently-uses-gobject-fix-linkage.patch b/debian/patches/0004-libglabels-silently-uses-gobject-fix-linkage.patch deleted file mode 100644 index 4b71e2f7..00000000 --- a/debian/patches/0004-libglabels-silently-uses-gobject-fix-linkage.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Jakob Haufe -Date: Mon, 12 Mar 2012 01:18:38 +0100 -Subject: libglabels silently uses gobject, fix linkage -Bug: https://sourceforge.net/tracker/?func=detail&aid=3514704&group_id=46122&atid=445116 - ---- - configure.ac | 1 + - libglabels/libglabels-3.0.pc.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ca2276d..26d3903 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -163,6 +163,7 @@ dnl - LIBGLABELS more modest prerequisites - dnl --------------------------------------------------------------------------- - PKG_CHECK_MODULES(LIBGLABELS, [\ - glib-2.0 >= $GLIB_REQUIRED \ -+ gobject-2.0 >= $GLIB_REQUIRED \ - libxml-2.0 >= $LIBXML_REQUIRED \ - ]) - -diff --git a/libglabels/libglabels-3.0.pc.in b/libglabels/libglabels-3.0.pc.in -index bb07823..13c824a 100644 ---- a/libglabels/libglabels-3.0.pc.in -+++ b/libglabels/libglabels-3.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: LIBGLABELS - Description: GLabels Template Library --Requires: glib-2.0 libxml-2.0 -+Requires: glib-2.0 gobject-2.0 libxml-2.0 - Version: @VERSION@ - Libs: -L${libdir} -lglabels-3.0 - Cflags: -I${includedir}/@LIBGLABELS_BRANCH@ diff --git a/debian/patches/0005-Ignore-unused-screenshot.patch b/debian/patches/0005-Ignore-unused-screenshot.patch deleted file mode 100644 index e70e5ac5..00000000 --- a/debian/patches/0005-Ignore-unused-screenshot.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Jakob Haufe -Date: Thu, 29 Mar 2012 22:20:26 +0200 -Subject: Ignore unused screenshot -Bug: https://sourceforge.net/tracker/?func=detail&aid=3515881&group_id=46122&atid=445116 - -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/0006-Fix-schema-references.patch b/debian/patches/0006-Fix-schema-references.patch deleted file mode 100644 index 372fa96c..00000000 --- a/debian/patches/0006-Fix-schema-references.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jakob Haufe -Date: Mon, 9 Apr 2012 17:42:39 +0200 -Subject: Fix schema references -Bug: https://sourceforge.net/tracker/?func=detail&aid=3516145&group_id=46122&atid=445116 - ---- - data/schemas/org.gnome.glabels-3.gschema.xml.in.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/data/schemas/org.gnome.glabels-3.gschema.xml.in.in b/data/schemas/org.gnome.glabels-3.gschema.xml.in.in -index c7e7ea9..065fe00 100644 ---- a/data/schemas/org.gnome.glabels-3.gschema.xml.in.in -+++ b/data/schemas/org.gnome.glabels-3.gschema.xml.in.in -@@ -2,10 +2,10 @@ - - - -- -- -- -- -+ -+ -+ -+ - - - diff --git a/debian/patches/series b/debian/patches/series index 928570cd..cfbb5c50 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,3 @@ 0001-menu.patch 0002-manpage.patch -0003-libglbarcode-uses-pangocairo-not-plain-pango.patch -0004-libglabels-silently-uses-gobject-fix-linkage.patch -0005-Ignore-unused-screenshot.patch -0006-Fix-schema-references.patch 0007-Ignore-license.page.patch