|
Patch for glabels package
Hi,
Attached a small patch for the package of the latest upstream release of
glabels (2.2.5).
I've updated the dependencies to match the build requirements.
I've tested the build with pbuilder and there is just 2 warning with
lintian (about nmu).
Hope this is usefull.
Rodolphe
[2.2.5.patch]
diff --git a/debian/changelog b/debian/changelog
index f272c04..44ff1e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
glabels (2.2.5-1) UNRELEASED; urgency=low
- * New Upstream Version
+ * New Upstream Version (Closes: #457970 #529011 #499459).
- -- Rodolphe Pelloux-Prayer <rodolphe@...> Fri, 12 Jun 2009 14:08:40 +0200
+ -- Rodolphe Pelloux-Prayer <rodolphe@...> Mon, 15 Jun 2009 21:56:50 +0200
glabels (2.1.3-4) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 335bcb0..400e244 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: Josselin Mouette <joss@...>, Loic Minier <lool@...>, Otavio Salvador <otavio@...>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
Homepage: http://glabels.sourceforge.net/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glabels/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glabels/
Package: glabels
Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 7c943af..ce32483 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/desktop/unstable/glabels/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/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},
-
|
|
Re: Patch for glabels package
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.
Cheers,
Emilio
|
|
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
[20090617.patch]
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@...> 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@...>, Josselin Mouette <joss@...>, Loic Minier <lool@...>, Otavio Salvador <otavio@...>
-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},
-
|
|
Re: Patch for glabels package
Rodolphe Pelloux-Prayer escribió:
> Oops, i've tried to check everything but i forget the patch itself :)
>
> This patch should be better.
Seems better, yeah :)
Just one comment: you should comment all your changes in debian/changelog, e.g.
- New upstream version.
+ Fixes foo. Closes: #123.
+ Bar now works correctly. Closes: #1234.
- debian/patches/foo: removed, applied upstream.
- debian/patches/baz: likewise.
- Standards-Version is 3.8.2, no changes needed (or list the changes)
- Added Vcs-Browser and Vcs-Svn fields.
etc.
Can you update the patch?
Cheers,
Emilio
|
|
 Re: Patch for glabels package
Rodolphe Pelloux-Prayer escribió:
> Le jeudi 18 juin 2009 à 00:10 +0200, Emilio Pozuelo Monfort a écrit :
>> Can you update the patch?
>
> Yep, voila!
>
> I've seen that lintian raise new warnings but I didn't take time to fix
> them (actually, I need to read about and make tests).
Thanks, applied!
I've fixed a couple of lintian warnings, and merged your changelog with the
previous one (which also was UNRELEASED).
The build-dependencies still need some changes (that were missing in the past),
e.g. GLib.
Cheers,
Emilio
|
|
Re: Patch for glabels package
Le samedi 20 juin 2009 à 22:31 +0200, Emilio Pozuelo Monfort a écrit :
> Rodolphe Pelloux-Prayer escribió:
> > Le jeudi 18 juin 2009 à 00:10 +0200, Emilio Pozuelo Monfort a écrit :
> >> Can you update the patch?
> >
> > Yep, voila!
> >
> > I've seen that lintian raise new warnings but I didn't take time to fix
> > them (actually, I need to read about and make tests).
>
> Thanks, applied!
>
> I've fixed a couple of lintian warnings, and merged your changelog with the
> previous one (which also was UNRELEASED).
>
> The build-dependencies still need some changes (that were missing in the past),
> e.g. GLib.
I updated the build-dependencies but I don't know how to correct the
warnings (I'm definitly not a libtool/gcc/autotools expert :) )
Rodolphe
[090703.patch]
diff --git a/debian/changelog b/debian/changelog
index 2fd50c8..02f5e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ glabels (2.2.5-1) UNRELEASED; urgency=low
+ Added Vcs-Browser and Vcs-Svn fields.
+ Remove libgnomeprintui dependency.
+ Update libebook, libgnomeui dependencies.
- + Add libgtk, libglade, intltool dependencies.
+ + Add missing build-dependencies.
[ Josselin Mouette ]
* watch: use sf.net virtual address to make uupdate work, thanks
diff --git a/debian/control b/debian/control
index d55678f..35370f6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,13 @@ Build-Depends: autotools-dev,
dh-buildinfo,
intltool (>= 0.21),
gnome-pkg-tools,
+ libglib2.0-dev (>= 2.12),
libgtk2.0-dev (>= 2.10),
- libglade2-dev (>= 2.6),
- libebook1.2-dev (>= 1.8),
+ libgnome2-dev (>= 2.16),
libgnomeui-dev (>= 2.16),
libxml2-dev (>= 2.6),
+ libglade2-dev (>= 2.6),
+ libebook1.2-dev (>= 1.8),
libxml-parser-perl,
scrollkeeper,
dpkg-dev (>= 1.13.19)
diff --git a/debian/control.in b/debian/control.in
index 88e2345..a4ee301 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,11 +8,13 @@ Build-Depends: autotools-dev,
dh-buildinfo,
intltool (>= 0.21),
gnome-pkg-tools,
+ libglib2.0-dev (>= 2.12),
libgtk2.0-dev (>= 2.10),
- libglade2-dev (>= 2.6),
- libebook1.2-dev (>= 1.8),
+ libgnome2-dev (>= 2.16),
libgnomeui-dev (>= 2.16),
libxml2-dev (>= 2.6),
+ libglade2-dev (>= 2.6),
+ libebook1.2-dev (>= 1.8),
libxml-parser-perl,
scrollkeeper,
dpkg-dev (>= 1.13.19)
|
|
Re: Patch for glabels package
Rodolphe Pelloux-Prayer wrote:
> Le samedi 20 juin 2009 à 22:31 +0200, Emilio Pozuelo Monfort a écrit :
>> Rodolphe Pelloux-Prayer escribió:
>>> Le jeudi 18 juin 2009 à 00:10 +0200, Emilio Pozuelo Monfort a écrit :
>>>> Can you update the patch?
>>> Yep, voila!
>>>
>>> I've seen that lintian raise new warnings but I didn't take time to fix
>>> them (actually, I need to read about and make tests).
>> Thanks, applied!
>>
>> I've fixed a couple of lintian warnings, and merged your changelog with the
>> previous one (which also was UNRELEASED).
>>
>> The build-dependencies still need some changes (that were missing in the past),
>> e.g. GLib.
>
> I updated the build-dependencies but I don't know how to correct the
> warnings (I'm definitly not a libtool/gcc/autotools expert :) )
Thanks, applied!
Best regards,
Emilio
|
signature.asc (196 bytes) 