Imported Debian patch 2.2.8-2

diff --git a/debian/changelog b/debian/changelog
index 331f813c7be08686ad2fce6db0a20184ad79667f..b9d3bf7bc50812d5d3971dbf2c18d24735027102 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+glabels (2.2.8-2) unstable; urgency=low
+
+  [ Olivier Berger ]
+  * QA upload.
+  * Updated Standards-Version
+  * Added several small changes to get rid of some lintian warnings
+
+  [ Neil Williams ]
+  * Tweak standards version. Apply QA changes from 569335. Thanks to
+    Olivier Berger <oberger@ouvaton.org>
+  * Move to collab-maint to make it easier for QA work.
+  * Drop shlib:Depends variable from -dev package, not used.
+  * Drop uploaders rule, not used by QA.
+
+ -- Neil Williams <codehelp@debian.org>  Sat, 14 May 2011 19:24:23 +0100
+
 glabels (2.2.8-1) unstable; urgency=low
 
   * New upstream release:

diff --git a/debian/control b/debian/control
index b97757fe0d838a185e8b59b28acd780b066d56c5..c2f345d9b82c292894635ca783ffdee051f84b28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
 Source: glabels
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 5.0),
@@ -23,8 +23,7 @@ Build-Depends: autotools-dev,
                libxml-parser-perl,
                scrollkeeper,
                dpkg-dev (>= 1.13.19)
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Otavio Salvador <otavio@debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 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/
@@ -36,6 +35,7 @@ Depends: glabels-data (= ${source:Version}),
          ${misc:Depends}
 Suggests: evolution-data-server
 Replaces: glabels-data (<< 2.2.5-1)
+Provides: libglabels5
 Description: label, business card and media cover creation program for GNOME
  gLabels is a lightweight program for creating labels, barcodes, business 
  cards and media covers for the GNOME desktop environment. It is designed to 
@@ -63,9 +63,11 @@ Depends: glabels (= ${binary:Version}),
          glabels-data (= ${source:Version}),
          libglib2.0-dev,
          libxml2-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Replaces: glabels (<< 2.0.2)
 Description: development documentation and library files for gLabels
  gLabels is a lightweight program for creating labels, barcodes, business 
  cards and media covers for the GNOME desktop environment.
+ .
+ This package provides the development environment for libglabels,
+ which is meant to facilitate 3rd party use of glabels templates.

diff --git a/debian/control.in b/debian/control.in
index 12c9e7fa425846553fc1976cf23efd8f44c4fe9c..ed147771074715783b5ca6dc810e345bee0137fc 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
 Source: glabels
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 5.0),
@@ -18,11 +18,10 @@ Build-Depends: autotools-dev,
                libxml-parser-perl,
                scrollkeeper,
                dpkg-dev (>= 1.13.19)
-Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 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/
+Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/glabels/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/glabels/trunk/?op=log
 
 Package: glabels
 Architecture: any
@@ -31,6 +30,7 @@ Depends: glabels-data (= ${source:Version}),
          ${misc:Depends}
 Suggests: evolution-data-server
 Replaces: glabels-data (<< 2.2.5-1)
+Provides: libglabels5
 Description: label, business card and media cover creation program for GNOME
  gLabels is a lightweight program for creating labels, barcodes, business 
  cards and media covers for the GNOME desktop environment. It is designed to 
@@ -58,9 +58,11 @@ Depends: glabels (= ${binary:Version}),
          glabels-data (= ${source:Version}),
          libglib2.0-dev,
          libxml2-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Replaces: glabels (<< 2.0.2)
 Description: development documentation and library files for gLabels
  gLabels is a lightweight program for creating labels, barcodes, business 
  cards and media covers for the GNOME desktop environment.
+ .
+ This package provides the development environment for libglabels,
+ which is meant to facilitate 3rd party use of glabels templates.

diff --git a/debian/glabels.lintian-overrides b/debian/glabels.lintian-overrides
new file mode 100644 (file)
index 0000000..a3b2394
--- /dev/null
+++ b/debian/glabels.lintian-overrides
@@ -0,0 +1 @@
+glabels: package-name-doesnt-match-sonames libglabels5

diff --git a/debian/patches/20_menu.patch b/debian/patches/20_menu.patch
new file mode 100644 (file)
index 0000000..c0cc5d2
--- /dev/null
+++ b/debian/patches/20_menu.patch
@@ -0,0 +1,14 @@
+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

diff --git a/debian/patches/series b/debian/patches/series
index 3b35f38347f38c8cbe4346eabc66f9934cf10c83..d2df0961025bb888f31000efd34211f10ee8c1b9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+20_menu.patch
 10_manpage.patch

diff --git a/debian/rules b/debian/rules
index 4ebe9c89a5ab848aed15ea4c7f1c13f5ba8a73a0..44a72039ceac2f48a1e257230bc11770ce08b020 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+#include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
 
 # Compilation options