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.
--- /dev/null
+From: Debian QA Group <packages@qa.debian.org>
+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
--- /dev/null
+From: Debian QA Group <packages@qa.debian.org>
+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 --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
++\fB\-i\fR \fIfilename\fR, \fB\-\-input\fR=\fIfilename\fR
++Set name of file with data to be merged to \fIfilename\fR. Typically
++this is a .csv file containing values to be printed on the labels.
++.TP
+ \fB\-s\fR \fIn\fR, \fB\-\-sheets\fR=\fIn\fR
+ Set number of sheets to \fIn\fR. (default=1)
+ .TP
+@@ -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
++\fB\-C\fR, \fB\-\-cropmarks\fR
++Print crop marks. Helpful for cutting up sheets.
++.TP
+ \fB\-r\fR, \fB\-\-reverse\fR
+ Print mirror image of labels. This is useful for clear labels intended to be
+ seen from the back through glass.
+++ /dev/null
-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 <ralph@mail.pangea.at>
-
-Document a couple of missing options in the manpage.
-
-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 @@
- \fB\-o\fR \fIfilename\fR, \fB\-\-output\fR=\fIfilename\fR
- Set output filename to \fIfilename\fR. (default="output.ps")
- .TP
-+\fB\-i\fR \fIfilename\fR, \fB\-\-input\fR=\fIfilename\fR
-+Set name of file with data to be merged to \fIfilename\fR. Typically
-+this is a .csv file containing values to be printed on the labels.
-+.TP
- \fB\-s\fR \fIn\fR, \fB\-\-sheets\fR=\fIn\fR
- Set number of sheets to \fIn\fR. (default=1)
- .TP
-@@ -55,6 +59,9 @@
- Print outlines around labels. This is useful for testing printer alignment
- or printing proof sheets.
- .TP
-+\fB\-C\fR, \fB\-\-cropmarks\fR
-+Print crop marks. Helpful for cutting up sheets.
-+.TP
- \fB\-r\fR, \fB\-\-reverse\fR
- Print mirror image of labels. This is useful for clear labels intended to be
- seen from the back through glass.
+++ /dev/null
-Author: Olivier Berger <oberger@ouvaton.org>
-
-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
+++ /dev/null
-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 <gregoa@debian.org>
-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: ");
+++ /dev/null
-Description: add '-lm' to linker arguments, otherwise the linking fails with binutils-golds or --no-add-needed
-Origin: vendor
-Forwarded: no
-Author: gregor herrmann <gregoa@debian.org>
-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 \
-20_menu.patch
-10_manpage.patch
-30_Werror-format-security.patch
-40_linker.patch
+0001-menu.patch
+0002-manpage.patch
projects / glabels / commitdiff