From 2106085bfc1b14e6112afdaa71d8f3b88af44b17 Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Mon, 12 Mar 2012 00:06:17 +0100 Subject: [PATCH] Regenerate debian/patches/* for 3.0.0 Names changed as we are now using gbp. Drop 30_Werror-format-security.patch as glabels no longer ships it's own version of barcode. Drop 40_linker.patch as these changes are upstream. --- debian/patches/0001-menu.patch | 19 +++++++ .../{10_manpage.patch => 0002-manpage.patch} | 20 +++++--- debian/patches/20_menu.patch | 14 ------ .../patches/30_Werror-format-security.patch | 18 ------- debian/patches/40_linker.patch | 49 ------------------- debian/patches/series | 6 +-- 6 files changed, 33 insertions(+), 93 deletions(-) create mode 100644 debian/patches/0001-menu.patch rename debian/patches/{10_manpage.patch => 0002-manpage.patch} (63%) delete mode 100644 debian/patches/20_menu.patch delete mode 100644 debian/patches/30_Werror-format-security.patch delete mode 100644 debian/patches/40_linker.patch diff --git a/debian/patches/0001-menu.patch b/debian/patches/0001-menu.patch new file mode 100644 index 00000000..1a18a62c --- /dev/null +++ b/debian/patches/0001-menu.patch @@ -0,0 +1,19 @@ +From: Debian QA Group +Date: Sun, 11 Mar 2012 23:52:33 +0100 +Subject: menu + +Make lintian happy removing useless Encoding in dektop menu entry +--- + data/desktop/glabels-3.0.desktop.in | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/data/desktop/glabels-3.0.desktop.in b/data/desktop/glabels-3.0.desktop.in +index 4d7d579..1c89039 100644 +--- a/data/desktop/glabels-3.0.desktop.in ++++ b/data/desktop/glabels-3.0.desktop.in +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + _Name=gLabels Label Designer 3 + _Comment=Create labels, business cards and media covers + Exec=glabels-3 %F diff --git a/debian/patches/10_manpage.patch b/debian/patches/0002-manpage.patch similarity index 63% rename from debian/patches/10_manpage.patch rename to debian/patches/0002-manpage.patch index 713999cc..e7ed4790 100644 --- a/debian/patches/10_manpage.patch +++ b/debian/patches/0002-manpage.patch @@ -1,13 +1,17 @@ -Bug: https://sourceforge.net/tracker/?func=detail&aid=2964354&group_id=46122&atid=445116 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357046 -Author: Ralph Aichinger +From: Debian QA Group +Date: Sun, 11 Mar 2012 23:52:33 +0100 +Subject: manpage Document a couple of missing options in the manpage. +--- + data/man/glabels-3.1 | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) -diff -urN glabels-2.1.3.orig/data/man/glabels.1 glabels-2.1.3/data/man/glabels.1 ---- glabels-2.1.3.orig/data/man/glabels.1 2006-06-27 18:11:28.997721992 +0200 -+++ glabels-2.1.3/data/man/glabels.1 2006-06-27 18:12:30.008446952 +0200 -@@ -42,6 +42,10 @@ +diff --git a/data/man/glabels-3.1 b/data/man/glabels-3.1 +index 5b5b434..c255d7c 100644 +--- a/data/man/glabels-3.1 ++++ b/data/man/glabels-3.1 +@@ -42,6 +42,10 @@ Print program version information. \fB\-o\fR \fIfilename\fR, \fB\-\-output\fR=\fIfilename\fR Set output filename to \fIfilename\fR. (default="output.ps") .TP @@ -18,7 +22,7 @@ diff -urN glabels-2.1.3.orig/data/man/glabels.1 glabels-2.1.3/data/man/glabels.1 \fB\-s\fR \fIn\fR, \fB\-\-sheets\fR=\fIn\fR Set number of sheets to \fIn\fR. (default=1) .TP -@@ -55,6 +59,9 @@ +@@ -55,6 +59,9 @@ Set label on first sheet to start printing from to \fIn\fR. (default=1) Print outlines around labels. This is useful for testing printer alignment or printing proof sheets. .TP diff --git a/debian/patches/20_menu.patch b/debian/patches/20_menu.patch deleted file mode 100644 index c0cc5d20..00000000 --- a/debian/patches/20_menu.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Olivier Berger - -Make lintian happy removing useless Encoding in dektop menu entry - -Index: glabels-2.2.8/data/desktop/glabels.desktop.in -=================================================================== ---- glabels-2.2.8.orig/data/desktop/glabels.desktop.in 2011-04-12 10:26:33.000000000 +0200 -+++ glabels-2.2.8/data/desktop/glabels.desktop.in 2011-04-12 10:26:48.000000000 +0200 -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - _Name=gLabels Label Designer - _Comment=Create labels, business cards and media covers - Exec=glabels %F diff --git a/debian/patches/30_Werror-format-security.patch b/debian/patches/30_Werror-format-security.patch deleted file mode 100644 index 2d99811a..00000000 --- a/debian/patches/30_Werror-format-security.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: add format argument to sprintf call to prevent failure with -Werror=format-security -Origin: vendor -Bug-Debian: http://bugs.debian.org/bug=643390 -Forwarded: no -Author: gregor herrmann -Last-Update: 2011-12-19 - ---- a/barcode-0.98/plessey.c -+++ b/barcode-0.98/plessey.c -@@ -148,7 +148,7 @@ - checkptr[i+j] ^= check[j]; - } - for (i = 0; i < 8; i++) { -- sprintf(ptr, patterns[checkptr[strlen(text) * 4 + i]]); -+ sprintf(ptr, "%s", patterns[checkptr[strlen(text) * 4 + i]]); - ptr += 2; - } - fprintf(stderr, "CRC: "); diff --git a/debian/patches/40_linker.patch b/debian/patches/40_linker.patch deleted file mode 100644 index 22f53c02..00000000 --- a/debian/patches/40_linker.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: add '-lm' to linker arguments, otherwise the linking fails with binutils-golds or --no-add-needed -Origin: vendor -Forwarded: no -Author: gregor herrmann -Last-Update: 2011-12-19 - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -30,7 +30,8 @@ - ../libglabels/libglabels.la \ - mygal/libmygal.la \ - $(LIB_BARCODE_DIR)/libbarcode.la \ -- $(LIB_IEC16022_DIR)/libiec16022.la -+ $(LIB_IEC16022_DIR)/libiec16022.la \ -+ -lm - - glabels_batch_LDFLAGS = -export-dynamic - -@@ -38,7 +39,8 @@ - $(GLABELS_LIBS) \ - ../libglabels/libglabels.la \ - $(LIB_BARCODE_DIR)/libbarcode.la \ -- $(LIB_IEC16022_DIR)/libiec16022.la -+ $(LIB_IEC16022_DIR)/libiec16022.la \ -+ -lm - - BUILT_SOURCES = \ - marshal.c \ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -365,14 +365,16 @@ - ../libglabels/libglabels.la \ - mygal/libmygal.la \ - $(LIB_BARCODE_DIR)/libbarcode.la \ -- $(LIB_IEC16022_DIR)/libiec16022.la -+ $(LIB_IEC16022_DIR)/libiec16022.la \ -+ -lm - - glabels_batch_LDFLAGS = -export-dynamic - glabels_batch_LDADD = \ - $(GLABELS_LIBS) \ - ../libglabels/libglabels.la \ - $(LIB_BARCODE_DIR)/libbarcode.la \ -- $(LIB_IEC16022_DIR)/libiec16022.la -+ $(LIB_IEC16022_DIR)/libiec16022.la \ -+ -lm - - BUILT_SOURCES = \ - marshal.c \ diff --git a/debian/patches/series b/debian/patches/series index 5b78de6a..89b8a0f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ -20_menu.patch -10_manpage.patch -30_Werror-format-security.patch -40_linker.patch +0001-menu.patch +0002-manpage.patch -- 2.39.5