* 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 <sur5r@sur5r.net> Fri, 16 Nov 2012 11:31:55 +0100
+++ /dev/null
-From: Jakob Haufe <sur5r@sur5r.net>
-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
+++ /dev/null
-From: Jakob Haufe <sur5r@sur5r.net>
-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@
+++ /dev/null
-From: Jakob Haufe <sur5r@sur5r.net>
-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 \
+++ /dev/null
-From: Jakob Haufe <sur5r@sur5r.net>
-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 @@
-
-
- <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@">
-- <child name="ui" schema="org.gnome.glabels.ui"/>
-- <child name="locale" schema="org.gnome.glabels.locale"/>
-- <child name="objects" schema="org.gnome.glabels.objects"/>
-- <child name="history" schema="org.gnome.glabels.history"/>
-+ <child name="ui" schema="org.gnome.glabels-3.ui"/>
-+ <child name="locale" schema="org.gnome.glabels-3.locale"/>
-+ <child name="objects" schema="org.gnome.glabels-3.objects"/>
-+ <child name="history" schema="org.gnome.glabels-3.history"/>
- </schema>
-
-
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
projects / glabels / commitdiff