Imported Debian patch 5.1.98.2-2

15 files changed, 119 insertions, 134 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 17db71f..77d1206 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
 Gutenprint for Debian
 ---------------------
 
-This is Gutenprint version 5.0.  Gutenprint is the print facility for
+This is Gutenprint version 5.2.  Gutenprint is the print facility for
 the GIMP, and in addition a suite of drivers that may be used with
 common UNIX spooling systems using Ghostscript or CUPS.  These drivers
 provide printing quality for UNIX/Linux on a par with proprietary
@@ -15,8 +15,5 @@ Documentation can be found in the gutenprint-doc package, which covers
 the use of libgutenprint-based programs, and the libgutenprint-doc
 package, which covers developing programs using libgutenprint.
 
-Gutenprint was previously known as Gimp-Print.  The name was changed
-for the 5.0 release.
 
-
- -- Roger Leigh <rleigh@debian.org>, Sun, 30 Jul 2006 20:47:46 +0100
+ -- Roger Leigh <rleigh@debian.org>, Fri, 09 May 2008 17:02:10 +0100
diff --git a/debian/changelog b/debian/changelog
index 5f1ad1b..dbc890c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,45 @@
-gutenprint (5.0.2-4) unstable; urgency=low
+gutenprint (5.1.98.2-2) experimental; 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.
+  * debian/cupsys-driver-gutenprint.postinst: Remove version suffix from
+    cups-genppdupdate.
+  * debian/rules, debian/cupsys-driver-gutenprint.install: Remove
+    cups-genppd; this is no longer needed with CUPS 1.2.x
+    (Closes: #474994).
+  * debian/control: Remove debian revision in Build-Depends package
+    versions.
 
- -- Roger Leigh <rleigh@debian.org>  Mon, 28 Jul 2008 21:03:43 +0100
+ -- Roger Leigh <rleigh@debian.org>  Sat, 10 May 2008 12:32:39 +0100
 
-gutenprint (5.0.2-3) unstable; urgency=low
+gutenprint (5.1.98.2-1) unstable; urgency=low
 
+  * New upstream stable beta release (Closes: #439961, #480113).
+  * debian/rules:
+    - Remove debian/libgutenprint2.install from GENERATED_FILES, and
+      remove the rule to generate it.
+    - Rename versioned binaries to 5.1.
+    - Remove commands for programs and manpages removed in this release.
   * 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
+    - Bump version from 5.0 to 5.1.
+    - cupsys-driver-gutenprint dependency on older ghostscript versions has
+      been restored, to allow migration to testing.
+  * debian/cupsys-driver-gutenprint.install:
+    - Rename versioned binaries to 5.1.
+    - Remove cups-genppdconfig.
+  * debian/cupsys-driver-gutenprint.postinst,
+    debian/cupsys-driver-gutenprint.postrm,
+    debian/cupsys-driver-gutenprint.preinst: Rename versioned binaries to
+    5.1.
+  * debian/gutenprint-doc.doc-base: Update version, section is now Graphics.
+  * debian/ijsgutenprint.install: Rename versioned binaries to 5.1.
+  * debian/libgutenprint2.install.in: Rename to
+    debian/libgutenprint2.install and hard-code version.
+  * debian/libgutenprint-doc.doc-base.developer,
+    debian/libgutenprint-doc.doc-base.reference: Section is now
+    Programming/C.
+  * debian/README.Debian: Bump version from 5.0 to 5.2.
+  * 
+
+ -- Roger Leigh <rleigh@debian.org>  Fri, 09 May 2008 17:04:37 +0100
 
 gutenprint (5.0.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 96a5807..f7eebb8 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.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
+Standards-Version: 3.7.3
+Build-Depends: libcupsys2-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
@@ -14,8 +14,8 @@ Enhances: gimp
 Description: print plugin for the GIMP
  This package includes the Gutenprint Print plugin for the GIMP.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -25,20 +25,12 @@ 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), cups (>= 1.3.7-6)
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.2.5) | cups (>= 1.2.5)
 Suggests: gutenprint-doc (>= ${source:Version}), gutenprint-locales (>= ${source:Version})
-Replaces: cupsys-driver-gutenprint, cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Conflicts: cupsys-driver-gimpprint
 Description: printer drivers for CUPS
  This package includes a CUPS driver based on Gutenprint.
  .
@@ -49,8 +41,8 @@ Description: printer drivers for CUPS
  .
    http://www.cups.org
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -71,8 +63,8 @@ Description: development files for the Gutenprint printer driver library
  Install this package if you wish to develop programs that use
  libgutenprint.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -93,8 +85,8 @@ Description: documentation for the Gutenprint printer driver library
  Install this package if you want to have lots of info about the
  Gutenprint library when you're programming.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -112,8 +104,8 @@ Description: runtime for the Gutenprint printer driver library
  This package includes the Gutenprint shared library, needed to
  run programs using Gutenprint drivers.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -136,8 +128,8 @@ Description: development files for the Gutenprint printer driver user interface
  Install this package if you wish to develop packages that use
  libgutenprintui.
  .
- This is Gutenprint version 5.0.2, a stable
- development release in the 5.0 line.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -156,8 +148,8 @@ Description: runtime for the Gutenprint printer driver user interface library
  gimp-print.  libgutenprintui contains GTK+ widgets which may be
  used for print dialogs etc. for use with libgutenprint.
  .
- This is Gutenprint version 5.0.2, a stable
- development release in the 5.0 line.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -171,14 +163,14 @@ Architecture: all
 Section: libs
 Description: locale data files for Gutenprint
  This package contains the i18n files of Gutenprint, used by
- libgutenprint2, cups-driver-gutenprint and
+ libgutenprint2, cupsys-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
  their messages in other languages than US English.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -196,8 +188,8 @@ Description: maintenance utility for Epson Stylus printers
  escputil is a utility to clean and align the heads of Epson Stylus
  printers.  It can also check the current ink levels in the printer.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
   .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -209,7 +201,7 @@ Description: maintenance utility for Epson Stylus printers
 Package: ijsgutenprint
 Architecture: any
 Section: text
-Depends: ${shlibs:Depends}, ghostscript (>= 8.61)
+Depends: ${shlibs:Depends}, ghostscript (>= 8.61) | gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14)
 Replaces: ijsgimpprint
 Conflicts: ijsgimpprint
 Description: inkjet server - Ghostscript driver for Gutenprint
@@ -223,12 +215,12 @@ 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, cups-driver-gutenprint is a better choice, but
+ are using CUPS, cupsys-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.
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -255,8 +247,8 @@ Description: OpenPrinting printer support - database for Gutenprint printer driv
  .
  Home Page: http://www.openprinting.org/
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -268,15 +260,15 @@ Description: OpenPrinting printer support - database for Gutenprint printer driv
 Package: gutenprint-doc
 Architecture: all
 Section: doc
-Suggests: cups-driver-gutenprint (>= ${binary:Version}), foomatic-db-gutenprint (>= ${source:Version}), gimp-print (>= ${binary:Version}), ijsgutenprint (>= ${binary:Version})
+Suggests: cupsys-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
  this covers using the Print plugin for the GIMP and the Common Unix
  Printing System (CUPS).
  .
- This is Gutenprint version 5.0.2, a stable release
- in the 5.0 series.
+ This is Gutenprint version 5.1.98.2, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
diff --git a/debian/control.in b/debian/control.in
index 93a497e..60cecd0 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.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
+Standards-Version: 3.7.3
+Build-Depends: libcupsys2-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
@@ -15,7 +15,7 @@ Description: print plugin for the GIMP
  This package includes the Gutenprint Print plugin for the GIMP.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -25,20 +25,12 @@ 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), cups (>= 1.3.7-6)
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.2.5) | cups (>= 1.2.5)
 Suggests: gutenprint-doc (>= ${source:Version}), gutenprint-locales (>= ${source:Version})
-Replaces: cupsys-driver-gutenprint, cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Conflicts: cupsys-driver-gimpprint
 Description: printer drivers for CUPS
  This package includes a CUPS driver based on Gutenprint.
  .
@@ -50,7 +42,7 @@ Description: printer drivers for CUPS
    http://www.cups.org
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -72,7 +64,7 @@ Description: development files for the Gutenprint printer driver library
  libgutenprint.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -94,7 +86,7 @@ Description: documentation for the Gutenprint printer driver library
  Gutenprint library when you're programming.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -113,7 +105,7 @@ Description: runtime for the Gutenprint printer driver library
  run programs using Gutenprint drivers.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -136,8 +128,8 @@ Description: development files for the Gutenprint printer driver user interface
  Install this package if you wish to develop packages that use
  libgutenprintui.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a stable
- development release in the 5.0 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -156,8 +148,8 @@ Description: runtime for the Gutenprint printer driver user interface library
  gimp-print.  libgutenprintui contains GTK+ widgets which may be
  used for print dialogs etc. for use with libgutenprint.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a stable
- development release in the 5.0 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -171,14 +163,14 @@ Architecture: all
 Section: libs
 Description: locale data files for Gutenprint
  This package contains the i18n files of Gutenprint, used by
- libgutenprint#LIBRARY_VERSION#, cups-driver-gutenprint and
+ libgutenprint#LIBRARY_VERSION#, cupsys-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
  their messages in other languages than US English.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -197,7 +189,7 @@ Description: maintenance utility for Epson Stylus printers
  printers.  It can also check the current ink levels in the printer.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
   .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -209,7 +201,7 @@ Description: maintenance utility for Epson Stylus printers
 Package: ijsgutenprint
 Architecture: any
 Section: text
-Depends: ${shlibs:Depends}, ghostscript (>= 8.61)
+Depends: ${shlibs:Depends}, ghostscript (>= 8.61) | gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14)
 Replaces: ijsgimpprint
 Conflicts: ijsgimpprint
 Description: inkjet server - Ghostscript driver for Gutenprint
@@ -223,12 +215,12 @@ 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, cups-driver-gutenprint is a better choice, but
+ are using CUPS, cupsys-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.
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -256,7 +248,7 @@ Description: OpenPrinting printer support - database for Gutenprint printer driv
  Home Page: http://www.openprinting.org/
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
@@ -268,7 +260,7 @@ Description: OpenPrinting printer support - database for Gutenprint printer driv
 Package: gutenprint-doc
 Architecture: all
 Section: doc
-Suggests: cups-driver-gutenprint (>= ${binary:Version}), foomatic-db-gutenprint (>= ${source:Version}), gimp-print (>= ${binary:Version}), ijsgutenprint (>= ${binary:Version})
+Suggests: cupsys-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
@@ -276,7 +268,7 @@ Description: users' guide for Gutenprint and CUPS
  Printing System (CUPS).
  .
  This is Gutenprint version #UPSTREAM_VERSION#, a stable release
- in the 5.0 series.
+ in the 5.1 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
  suite of drivers that may be used with common UNIX spooling systems
diff --git a/debian/cups-driver-gutenprint.docs b/debian/cupsys-driver-gutenprint.docs
index 0b55f7f..0b55f7f 100644
--- a/debian/cups-driver-gutenprint.docs
+++ b/debian/cupsys-driver-gutenprint.docs
diff --git a/debian/cups-driver-gutenprint.install b/debian/cupsys-driver-gutenprint.install
index a1dd326..0e5696e 100644
--- a/debian/cups-driver-gutenprint.install
+++ b/debian/cupsys-driver-gutenprint.install
@@ -1,12 +1,8 @@
 debian/install/etc/cups/command.types                  usr/share/cups/mime
 debian/install/usr/bin/cups-calibrate                  usr/bin
-debian/install/usr/sbin/cups-genppd.5.0                usr/sbin
-debian/install/usr/sbin/cups-genppdconfig.5.0          usr/sbin
-debian/install/usr/sbin/cups-genppdupdate.5.0          usr/sbin
+debian/install/usr/sbin/cups-genppdupdate              usr/sbin
 debian/install/usr/lib/cups                            usr/lib
 debian/install/usr/share/cups/calibrate.ppm            usr/share/cups
 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/cups-driver-gutenprint/samples
+samples/profile.jpg                                    usr/share/doc/cupsys-driver-gutenprint/samples
diff --git a/debian/cups-driver-gutenprint.postinst b/debian/cupsys-driver-gutenprint.postinst
index 728834d..85958de 100644
--- a/debian/cups-driver-gutenprint.postinst
+++ b/debian/cupsys-driver-gutenprint.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cups-driver-gutenprint
+# postinst script for cupsys-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -26,9 +26,9 @@ set -e
 
 if [ "$1" = "configure" ]; then
   # Upgrade in-use PPD files
-  /usr/sbin/cups-genppdupdate.5.0
+  /usr/sbin/cups-genppdupdate
   # Restart CUPSys (to register new and updated PPDs)
-  [ -x /etc/init.d/cups ] && invoke-rc.d cups force-reload || true
+  [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true
 elif [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ] || [ "$1" = "abort-deconfigure" ]; then
   :
 else
diff --git a/debian/cups-driver-gutenprint.postrm b/debian/cupsys-driver-gutenprint.postrm
index 7e3b384..4891c5e 100644
--- a/debian/cups-driver-gutenprint.postrm
+++ b/debian/cupsys-driver-gutenprint.postrm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for cups-driver-gutenprint
+# postrm script for cupsys-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -19,11 +19,11 @@ set -e
 if [ "$1" = remove ]; then
     # Remove generated PPDs
     # (note: user-generated now we no longer generate them automatically)
-    rm -rf /usr/share/cups/model/gutenprint/5.0
+    rm -rf /usr/share/cups/model/gutenprint/5.1
     rmdir /usr/share/cups/model/gutenprint 2>/dev/null || true
-    rm -rf /usr/share/ppd/gutenprint/5.0
+    rm -rf /usr/share/ppd/gutenprint/5.1
     rmdir /usr/share/ppd/gutenprint 2>/dev/null || true
-    [ -x /etc/init.d/cups ] && invoke-rc.d cups force-reload || true
+    [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true
 fi
 
 if [ "$1" = purge ]; then
diff --git a/debian/cups-driver-gutenprint.preinst b/debian/cupsys-driver-gutenprint.preinst
index 04f6163..237084a 100644
--- a/debian/cups-driver-gutenprint.preinst
+++ b/debian/cupsys-driver-gutenprint.preinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# preinst script for cups-driver-gutenprint
+# preinst script for cupsys-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -18,9 +18,9 @@ install|upgrade)
     # This is to ensure stale PPDs from previous versions are removed.
     # When Gutenprint no longer allows the user to generate PPDs, make
     # this into a versioned check.
-    rm -rf /usr/share/cups/model/gutenprint/5.0
+    rm -rf /usr/share/cups/model/gutenprint/5.1
     rmdir /usr/share/cups/model/gutenprint 2>/dev/null || true
-    rm -rf /usr/share/ppd/gutenprint/5.0
+    rm -rf /usr/share/ppd/gutenprint/5.1
     rmdir /usr/share/ppd/gutenprint 2>/dev/null || true
 
     # Remove /etc/command.types (moved to
diff --git a/debian/gutenprint-doc.doc-base b/debian/gutenprint-doc.doc-base
index af619d0..7864fb9 100644
--- a/debian/gutenprint-doc.doc-base
+++ b/debian/gutenprint-doc.doc-base
@@ -1,5 +1,5 @@
 Document: gutenprint-doc
-Title: Gutenprint 5.0 User's Manual
+Title: Gutenprint 5.1 User's Manual
 Author: Robert Krawitz
 Abstract: Gutenprint is a set of printer drivers written to take
  advantage of the full capabilities of a wide range of printers. This
diff --git a/debian/ijsgutenprint.install b/debian/ijsgutenprint.install
index 46c6e2d..76ad411 100644
--- a/debian/ijsgutenprint.install
+++ b/debian/ijsgutenprint.install
@@ -1,2 +1,2 @@
-debian/install/usr/bin/ijsgutenprint.5.0           usr/bin
+debian/install/usr/bin/ijsgutenprint.5.1           usr/bin
 debian/install/usr/share/man/man1/ijsgutenprint.1  usr/share/man/man1
diff --git a/debian/libgutenprint2.install b/debian/libgutenprint2.install
new file mode 100644
index 0000000..eae4884
--- /dev/null
+++ b/debian/libgutenprint2.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprint.so.*  usr/lib
+debian/install/usr/lib/gutenprint          usr/lib
+debian/install/usr/share/gutenprint/5.1    usr/share/gutenprint
diff --git a/debian/libgutenprint2.install.in b/debian/libgutenprint2.install.in
deleted file mode 100644
index 1a0d0f4..0000000
--- a/debian/libgutenprint2.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/install/usr/lib/libgutenprint.so.*                  usr/lib
-debian/install/usr/lib/gutenprint                          usr/lib
-debian/install/usr/share/gutenprint/#UPSTREAM_VERSION#     usr/share/gutenprint
diff --git a/debian/patches/00list b/debian/patches/00list
index ebf096e..a9dec04 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
 20_fix_gimpprint_menu_entry.dpatch
-21_gutenprintui_plist_localefix.dpatch
diff --git a/debian/rules b/debian/rules
index c209a92..9986ac4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,14 +25,13 @@ endif
 
 # Get upstream version, and define libgutenprint suffix
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//")
-#UPSTREAM_VERSION = 5.0.0
+#UPSTREAM_VERSION = 5.1.0
 UPSTREAM_VERSION_COMPACT = $(shell echo '$(UPSTREAM_VERSION)' | sed "s/\(.*\..*\)\..*/\1/"
 #LIBRARY_VERSION =  -$(UPSTREAM_VERSION)
 LIBRARY_VERSION = 2
 LIBRARYUI_VERSION = 1
 
-GENERATED_FILES = \
-	debian/libgutenprint2.install
+GENERATED_FILES =
 
 autoconfigure: autoconfigure-stamp
 autoconfigure-stamp: debian/control $(GENERATED_FILES)
@@ -114,13 +113,10 @@ binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
-	  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
+	  cp src/cups/README debian/cupsys-driver-gutenprint/usr/share/doc/cupsys-driver-gutenprint/README.cups
+	  mv debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1 debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.5.1.1
+	  ln -s ijsgutenprint.5.1.1.gz debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1.gz
+	  ln -s ijsgutenprint.5.1 debian/ijsgutenprint/usr/bin/ijsgutenprint
 	dh_installexamples -a
 	dh_installchangelogs -a NEWS
 	dh_strip -a
@@ -128,8 +124,7 @@ binary-arch: build install
 	dh_compress -a -X.pdf -X.odt
 	dh_fixperms -a
 # Strip DT_RPATH from CUPS binaries.
-	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
+	find debian/cupsys-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete
 	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
@@ -144,7 +139,4 @@ SEDPATTERN = -e "s/\#UPSTREAM_VERSION\#/$(UPSTREAM_VERSION)/g" -e "s/\#LIBRARY_V
 debian/control: debian/control.in debian/changelog debian/rules
 	sed $(SEDPATTERN) <$< >$@
 
-debian/libgutenprint2.install: debian/libgutenprint2.install.in debian/changelog
-	sed $(SEDPATTERN) <$< >$@
-
 .PHONY: build clean binary-indep binary-arch binary install autoconfigure patch unpatch