Re: Patch for glabels package
Le mardi 16 juin 2009 à 16:15 +0200, Emilio Pozuelo Monfort a écrit :
> Rodolphe Pelloux-Prayer escribió:
> > Hi,
> >
> > Attached a small patch for the package of the latest upstream release of
> > glabels (2.2.5).
>
> Hi Rodolphe,
>
> The patch is not against our svn, it seems you diffed against your previous
> changes or something like that.
Oops, i've tried to check everything but i forget the patch itself :)
This patch should be better.
Best regards,
Rodolphe
diff --git a/debian/changelog b/debian/changelog
index fb78283..44ff1e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glabels (2.2.5-1) UNRELEASED; urgency=low
+
+ * New Upstream Version (Closes: #457970 #529011 #499459).
+
+ -- Rodolphe Pelloux-Prayer <rodolphe@damsy.net> Mon, 15 Jun 2009 21:56:50 +0200
+
glabels (2.1.3-4) UNRELEASED; urgency=low
[ Josselin Mouette ]
diff --git a/debian/control b/debian/control
index 335bcb0..8cb212b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,21 @@ Build-Depends: autotools-dev,
cdbs,
debhelper (>= 5.0),
dh-buildinfo,
+ intltool (>= 0.21),
gnome-pkg-tools,
- libebook1.2-dev (>= 1.4),
- libgnomeui-dev (>= 2.12),
- libgnomeprintui2.2-dev (>= 2.12),
+ libgtk2.0-dev (>= 2.10),
+ libglade2-dev (>= 2.6),
+ libebook1.2-dev (>= 1.8),
+ libgnomeui-dev (>= 2.16),
libxml2-dev (>= 2.6),
libxml-parser-perl,
scrollkeeper,
dpkg-dev (>= 1.13.19)
Uploaders: Andrew Lau <netsnipe@users.sourceforge.net>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Otavio Salvador <otavio@debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
Homepage: http://glabels.sourceforge.net/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/glabels/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/glabels/
Package: glabels
Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 7c943af..6299282 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,17 +6,21 @@ Build-Depends: autotools-dev,
cdbs,
debhelper (>= 5.0),
dh-buildinfo,
+ intltool (>= 0.21),
gnome-pkg-tools,
- libebook1.2-dev (>= 1.4),
- libgnomeui-dev (>= 2.12),
- libgnomeprintui2.2-dev (>= 2.12),
+ libgtk2.0-dev (>= 2.10),
+ libglade2-dev (>= 2.6),
+ libebook1.2-dev (>= 1.8),
+ libgnomeui-dev (>= 2.16),
libxml2-dev (>= 2.6),
libxml-parser-perl,
scrollkeeper,
dpkg-dev (>= 1.13.19)
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
Homepage: http://glabels.sourceforge.net/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/glabels/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/glabels/
Package: glabels
Architecture: any
diff --git a/debian/patches/01_null_strlen.patch b/debian/patches/01_null_strlen.patch
deleted file mode 100644
index 63874ac..0000000
--- a/debian/patches/01_null_strlen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wdgt-media-select.c.orig 2007-10-01 12:42:50.553715770 +0200
-+++ src/wdgt-media-select.c 2007-10-01 12:44:28.307286428 +0200
-@@ -381,7 +381,7 @@
- /* Update mini_preview canvas & details with template */
- gl_debug (DEBUG_MEDIA_SELECT, "template_combo = %p", combo);
- name = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo));
-- if ( strlen(name) ) {
-+ if ( name && strlen(name) ) {
- gl_debug (DEBUG_MEDIA_SELECT, "name = \"%s\"", name);
- gl_wdgt_mini_preview_set_label_by_name (GL_WDGT_MINI_PREVIEW (media_select->mini_preview),
- name);
diff --git a/debian/patches/11_cepnet.patch b/debian/patches/11_cepnet.patch
deleted file mode 100644
index a78d84c..0000000
--- a/debian/patches/11_cepnet.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: src/bc-postnet.c
-===================================================================
---- src/bc-postnet.c (revision 661)
-+++ src/bc-postnet.c (working copy)
-@@ -94,6 +94,7 @@
- /* Validate code length for all subtypes. */
- if ( (g_strcasecmp (id, "POSTNET") == 0) ) {
- if (!is_length_valid (digits, 5) &&
-+ !is_length_valid (digits, 8) &&
- !is_length_valid (digits, 9) &&
- !is_length_valid (digits, 11)) {
- return NULL;
-@@ -114,6 +115,11 @@
- return NULL;
- }
- }
-+ if ( (g_strcasecmp (id, "CEPNET") == 0) ) {
-+ if (!is_length_valid (digits, 8)) {
-+ return NULL;
-+ }
-+ }
-
- /* First get code string */
- code = postnet_code (digits);
-Index: src/bc.c
-===================================================================
---- src/bc.c (revision 661)
-+++ src/bc.c (working copy)
-@@ -76,6 +76,9 @@
- { "POSTNET-11", N_("POSTNET-11 (DPBC)"), gl_barcode_postnet_new,
- FALSE, FALSE, TRUE, FALSE, "12345-6789-12", FALSE, 11},
-
-+ { "CEPNET", N_("CEPNET"), gl_barcode_postnet_new,
-+ FALSE, FALSE, TRUE, FALSE, "12345-678", FALSE, 8},
-+
- { "EAN", N_("EAN (any)"), gl_barcode_gnubarcode_new,
- TRUE, TRUE, TRUE, FALSE, "000000000000 00000", FALSE, 17},
-
Reply to: