Imported Debian patch 5.0.2-4

12 files changed, 73 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index 19c8eb6..5f1ad1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+gutenprint (5.0.2-4) unstable; urgency=low
+
+  * debian/control.in:
+    - Add back cupsys-driver-gutenprint as a transitional package to
+      ease upgrades to cups-driver-gutenprint (Closes: #491331).
+    - cups-driver-gutenprint additionally replaces
+      cupsys-driver-gimpprint and cupsys-driver-gimpprint-data to ease
+      upgrades from sarge.
+
+ -- Roger Leigh <rleigh@debian.org>  Mon, 28 Jul 2008 21:03:43 +0100
+
+gutenprint (5.0.2-3) unstable; urgency=low
+
+  * debian/control.in:
+    - Rename cupsys-driver-gutenprint to cups-driver-gutenprint
+      (Closes: #486126).
+    - Remove old Conflicts and Replaces on cupsys-driver-gimpprint*
+      packages, which are only present in oldstable and earlier releases.
+    - Upgrade to Standards-Version 3.8.0.
+    - Don't Build-Depend upon -1 Debian revisions.
+  * debian/*.doc-base: Use new doc-base sections.
+  * debian/cups-driver-gutenprint.p*: Use /etc/init.d/cups in place of
+    /etc/init.d/cupsys.
+
+ -- Roger Leigh <rleigh@debian.org>  Mon, 30 Jun 2008 09:03:54 +0100
+
 gutenprint (5.0.2-2) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 9f0b822..96a5807 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: graphics
 Priority: optional
 Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
 Uploaders: Roger Leigh <rleigh@debian.org>
-Standards-Version: 3.7.3
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+Standards-Version: 3.8.0
+Build-Depends: libcups2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1), chrpath (>= 0.12), dpatch
 
 Package: gimp-gutenprint
 Architecture: any
@@ -25,12 +25,20 @@ Description: print plugin for the GIMP
  tasks.  Gutenprint was formerly known as Gimp-Print.
 
 Package: cupsys-driver-gutenprint
+Architecture: all
+Section: graphics
+Depends: cups-driver-gutenprint (>= ${source:Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ cupsys-driver-gutenprint to cups-driver-gutenprint (its successor).
+ It may be safely removed after upgrading.
+
+Package: cups-driver-gutenprint
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.2.5) | cups (>= 1.2.5)
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), cups (>= 1.3.7-6)
 Suggests: gutenprint-doc (>= ${source:Version}), gutenprint-locales (>= ${source:Version})
-Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
-Conflicts: cupsys-driver-gimpprint
+Replaces: cupsys-driver-gutenprint, cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
 Description: printer drivers for CUPS
  This package includes a CUPS driver based on Gutenprint.
  .
@@ -163,7 +171,7 @@ Architecture: all
 Section: libs
 Description: locale data files for Gutenprint
  This package contains the i18n files of Gutenprint, used by
- libgutenprint2, cupsys-driver-gutenprint and
+ libgutenprint2, cups-driver-gutenprint and
  escputil.  It is also used by the GIMP Print plugin.
  .
  They are needed when you want the programs in Gutenprint to print
@@ -215,7 +223,7 @@ Description: inkjet server - Ghostscript driver for Gutenprint
  .
  If you wish to print using Ghostscript and the Gutenprint drivers,
  install this package.  This is typical for LPRng setups.  If you
- are using CUPS, cupsys-driver-gutenprint is a better choice, but
+ are using CUPS, cups-driver-gutenprint is a better choice, but
  this package will still work with the appropriate foomatic setup
  if you wish to make use of foomatic.
  .
@@ -260,7 +268,7 @@ Description: OpenPrinting printer support - database for Gutenprint printer driv
 Package: gutenprint-doc
 Architecture: all
 Section: doc
-Suggests: cupsys-driver-gutenprint (>= ${binary:Version}), foomatic-db-gutenprint (>= ${source:Version}), gimp-print (>= ${binary:Version}), ijsgutenprint (>= ${binary:Version})
+Suggests: cups-driver-gutenprint (>= ${binary:Version}), foomatic-db-gutenprint (>= ${source:Version}), gimp-print (>= ${binary:Version}), ijsgutenprint (>= ${binary:Version})
 Description: users' guide for Gutenprint and CUPS
  This package contains a user guide for programs using the
  Gutenprint library for photographic quality printing.  Currently
diff --git a/debian/control.in b/debian/control.in
index 45b6cb1..93a497e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,8 +3,8 @@ Section: graphics
 Priority: optional
 Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
 Uploaders: Roger Leigh <rleigh@debian.org>
-Standards-Version: 3.7.3
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+Standards-Version: 3.8.0
+Build-Depends: libcups2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1), chrpath (>= 0.12), dpatch
 
 Package: gimp-gutenprint
 Architecture: any
@@ -25,12 +25,20 @@ Description: print plugin for the GIMP
  tasks.  Gutenprint was formerly known as Gimp-Print.
 
 Package: cupsys-driver-gutenprint
+Architecture: all
+Section: graphics
+Depends: cups-driver-gutenprint (>= ${source:Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ cupsys-driver-gutenprint to cups-driver-gutenprint (its successor).
+ It may be safely removed after upgrading.
+
+Package: cups-driver-gutenprint
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.2.5) | cups (>= 1.2.5)
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), cups (>= 1.3.7-6)
 Suggests: gutenprint-doc (>= ${source:Version}), gutenprint-locales (>= ${source:Version})
-Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
-Conflicts: cupsys-driver-gimpprint
+Replaces: cupsys-driver-gutenprint, cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
 Description: printer drivers for CUPS
  This package includes a CUPS driver based on Gutenprint.
  .
@@ -163,7 +171,7 @@ Architecture: all
 Section: libs
 Description: locale data files for Gutenprint
  This package contains the i18n files of Gutenprint, used by
- libgutenprint#LIBRARY_VERSION#, cupsys-driver-gutenprint and
+ libgutenprint#LIBRARY_VERSION#, cups-driver-gutenprint and
  escputil.  It is also used by the GIMP Print plugin.
  .
  They are needed when you want the programs in Gutenprint to print
@@ -215,7 +223,7 @@ Description: inkjet server - Ghostscript driver for Gutenprint
  .
  If you wish to print using Ghostscript and the Gutenprint drivers,
  install this package.  This is typical for LPRng setups.  If you
- are using CUPS, cupsys-driver-gutenprint is a better choice, but
+ are using CUPS, cups-driver-gutenprint is a better choice, but
  this package will still work with the appropriate foomatic setup
  if you wish to make use of foomatic.
  .
@@ -260,7 +268,7 @@ Description: OpenPrinting printer support - database for Gutenprint printer driv
 Package: gutenprint-doc
 Architecture: all
 Section: doc
-Suggests: cupsys-driver-gutenprint (>= ${binary:Version}), foomatic-db-gutenprint (>= ${source:Version}), gimp-print (>= ${binary:Version}), ijsgutenprint (>= ${binary:Version})
+Suggests: cups-driver-gutenprint (>= ${binary:Version}), foomatic-db-gutenprint (>= ${source:Version}), gimp-print (>= ${binary:Version}), ijsgutenprint (>= ${binary:Version})
 Description: users' guide for Gutenprint and CUPS
  This package contains a user guide for programs using the
  Gutenprint library for photographic quality printing.  Currently
diff --git a/debian/cupsys-driver-gutenprint.docs b/debian/cups-driver-gutenprint.docs
index 0b55f7f..0b55f7f 100644
--- a/debian/cupsys-driver-gutenprint.docs
+++ b/debian/cups-driver-gutenprint.docs
diff --git a/debian/cupsys-driver-gutenprint.install b/debian/cups-driver-gutenprint.install
index 5088061..a1dd326 100644
--- a/debian/cupsys-driver-gutenprint.install
+++ b/debian/cups-driver-gutenprint.install
@@ -9,4 +9,4 @@ debian/install/usr/share/man/man8/cups-calibrate.8     usr/share/man/man8
 debian/install/usr/share/man/man8/cups-genppd.8        usr/share/man/man8
 debian/install/usr/share/man/man8/cups-genppdconfig.8  usr/share/man/man8
 debian/install/usr/share/man/man8/cups-genppdupdate.8  usr/share/man/man8
-samples/profile.jpg                                    usr/share/doc/cupsys-driver-gutenprint/samples
+samples/profile.jpg                                    usr/share/doc/cups-driver-gutenprint/samples
diff --git a/debian/cupsys-driver-gutenprint.postinst b/debian/cups-driver-gutenprint.postinst
index 58071c7..728834d 100644
--- a/debian/cupsys-driver-gutenprint.postinst
+++ b/debian/cups-driver-gutenprint.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys-driver-gutenprint
+# postinst script for cups-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -28,7 +28,7 @@ if [ "$1" = "configure" ]; then
   # Upgrade in-use PPD files
   /usr/sbin/cups-genppdupdate.5.0
   # Restart CUPSys (to register new and updated PPDs)
-  [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true
+  [ -x /etc/init.d/cups ] && invoke-rc.d cups force-reload || true
 elif [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ] || [ "$1" = "abort-deconfigure" ]; then
   :
 else
diff --git a/debian/cupsys-driver-gutenprint.postrm b/debian/cups-driver-gutenprint.postrm
index a89e437..7e3b384 100644
--- a/debian/cupsys-driver-gutenprint.postrm
+++ b/debian/cups-driver-gutenprint.postrm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for cupsys-driver-gutenprint
+# postrm script for cups-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -23,7 +23,7 @@ if [ "$1" = remove ]; then
     rmdir /usr/share/cups/model/gutenprint 2>/dev/null || true
     rm -rf /usr/share/ppd/gutenprint/5.0
     rmdir /usr/share/ppd/gutenprint 2>/dev/null || true
-    [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true
+    [ -x /etc/init.d/cups ] && invoke-rc.d cups force-reload || true
 fi
 
 if [ "$1" = purge ]; then
diff --git a/debian/cupsys-driver-gutenprint.preinst b/debian/cups-driver-gutenprint.preinst
index 1314df4..04f6163 100644
--- a/debian/cupsys-driver-gutenprint.preinst
+++ b/debian/cups-driver-gutenprint.preinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# preinst script for cupsys-driver-gutenprint
+# preinst script for cups-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/gutenprint-doc.doc-base b/debian/gutenprint-doc.doc-base
index ab5b3f0..af619d0 100644
--- a/debian/gutenprint-doc.doc-base
+++ b/debian/gutenprint-doc.doc-base
@@ -5,7 +5,7 @@ Abstract: Gutenprint is a set of printer drivers written to take
  advantage of the full capabilities of a wide range of printers. This
  document explaina how to configure and use the Gutenprint software to
  achieve high quality printouts.
-Section: Apps/Graphics
+Section: Graphics
 
 Format: PDF
 Files: /usr/share/doc/gutenprint-doc/gutenprint-users-manual.pdf
diff --git a/debian/libgutenprint-doc.doc-base.developer b/debian/libgutenprint-doc.doc-base.developer
index 20edf8d..9a6f71e 100644
--- a/debian/libgutenprint-doc.doc-base.developer
+++ b/debian/libgutenprint-doc.doc-base.developer
@@ -8,7 +8,7 @@ Abstract: The gutenprint library routines give programmers an interface to
  demanding printing tasks.  This manual covers developing programs that use
  libgutenprint for printing, as well as the concepts and internals of the
  library.
-Section: Apps/Programming
+Section: Programming/C
 
 Format: HTML
 Index: /usr/share/doc/libgutenprint-doc/developer/html/book1.html
diff --git a/debian/libgutenprint-doc.doc-base.reference b/debian/libgutenprint-doc.doc-base.reference
index 303c3ef..99c43cf 100644
--- a/debian/libgutenprint-doc.doc-base.reference
+++ b/debian/libgutenprint-doc.doc-base.reference
@@ -7,7 +7,7 @@ Abstract: The gutenprint library routines give programmers an interface to
  vendor-supplied drivers in many cases, and can be used for many of the most
  demanding printing tasks. This manual is a reference to the libgutenprint
  library.
-Section: Apps/Programming
+Section: Programming/C
 
 Format: HTML
 Index: /usr/share/doc/libgutenprint-doc/reference/html/index.html
diff --git a/debian/rules b/debian/rules
index 07ab23e..c209a92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,10 +114,10 @@ binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
-	  cp src/cups/README debian/cupsys-driver-gutenprint/usr/share/doc/cupsys-driver-gutenprint/README.cups
-	  mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.5.0.8
-	  mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.5.0.8
-	  mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.5.0.8
+	  cp src/cups/README debian/cups-driver-gutenprint/usr/share/doc/cups-driver-gutenprint/README.cups
+	  mv debian/cups-driver-gutenprint/usr/share/man/man8/cups-genppd.8 debian/cups-driver-gutenprint/usr/share/man/man8/cups-genppd.5.0.8
+	  mv debian/cups-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.8 debian/cups-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.5.0.8
+	  mv debian/cups-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.8 debian/cups-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.5.0.8
 	  mv debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1 debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.5.0.1
 	  ln -s ijsgutenprint.5.0.1.gz debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1.gz
 	  ln -s ijsgutenprint.5.0 debian/ijsgutenprint/usr/bin/ijsgutenprint
@@ -128,8 +128,8 @@ binary-arch: build install
 	dh_compress -a -X.pdf -X.odt
 	dh_fixperms -a
 # Strip DT_RPATH from CUPS binaries.
-	find debian/cupsys-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete
-	chrpath --delete debian/cupsys-driver-gutenprint/usr/sbin/cups-genppd.5.0
+	find debian/cups-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete
+	chrpath --delete debian/cups-driver-gutenprint/usr/sbin/cups-genppd.5.0
 	dh_makeshlibs -a -V -X usr/lib/gutenprint
 	dh_installdeb -a
 	dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib