Imported Debian patch 4.3.99+cvs20050702-1

46 files changed, 635 insertions, 1060 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 332c90c..816cb6c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,21 +1,23 @@
-Gimp-Print for Debian
+Gutenprint for Debian
 ---------------------
 
-This is Gimp-Print version 4.2.7, a stable release in the 4.2 series
-and the final planned 4.2 release.  Gimp-Print is a suite of printer
-drivers that may be used with common UNIX spooling systems using
-Ghostscript or CUPS.  These drivers provide printing quality for
-UNIX/Linux in many cases equal to or better than proprietary
-vendor-supplied drivers, and can be used for many of the most
-demanding printing tasks.
+This is Gutenprint version 5.0.0-beta2, a beta release in the 5.0
+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 using Ghostscript or CUPS.  These drivers provide printing
+quality for UNIX/Linux on a par with proprietary vendor-supplied
+drivers in many cases, and can be used for many of the most demanding
+printing tasks.
 
 A complete list of supported printers may be found in the NEWS file.
 On Debian GNU/Linux, the NEWS file is called `changelog.gz'.
 
-Gimp-Print also includes the printing facility for the GIMP.
+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.
 
-Documentation can be found in the gimpprint-doc package, which covers
-the use of libgimpprint-based programs, and the libgimpprint-doc
-package, which covers developing programs using libgimpprint.
+Gutenprint was previously knows as Gimp-Print.  The name was changed
+for the 5.0 release.
 
- -- Roger Leigh <roger@whinlatter.uklinux.net>,  Wed,  9 Oct 2002 21:19:59 +0100
+
+ -- Roger Leigh <rleigh@debian.org>,  Sun, 12 Sep 2004 10:50:34 +0100
diff --git a/debian/README.Debian.~1.22.2.32.~ b/debian/README.Debian.~1.22.2.32.~
deleted file mode 100644
index 2dd9034..0000000
--- a/debian/README.Debian.~1.22.2.32.~
+++ /dev/null
@@ -1,21 +0,0 @@
-Gimp-Print for Debian
----------------------
-
-This is Gimp-Print version 4.2.7-pre2, a prerelease in the 4.2 series
-and the final planned 4.2 release.  Gimp-Print is a suite of printer
-drivers that may be used with common UNIX spooling systems using
-Ghostscript or CUPS.  These drivers provide printing quality for
-UNIX/Linux in many cases equal to or better than proprietary
-vendor-supplied drivers, and can be used for many of the most
-demanding printing tasks.
-
-A complete list of supported printers may be found in the NEWS file.
-On Debian GNU/Linux, the NEWS file is called `changelog.gz'.
-
-Gimp-Print also includes the printing facility for the GIMP.
-
-Documentation can be found in the gimpprint-doc package, which covers
-the use of libgimpprint-based programs, and the libgimpprint-doc
-package, which covers developing programs using libgimpprint.
-
- -- Roger Leigh <roger@whinlatter.uklinux.net>,  Wed,  9 Oct 2002 21:19:59 +0100
diff --git a/debian/README.building b/debian/README.building
index bd9e86f..ca73a6d 100644
--- a/debian/README.building
+++ b/debian/README.building
@@ -1,18 +1,19 @@
-Building the gimp-print Debian packages	                 -*- mode: text -*-
+Building the gutenprint Debian packages	                 -*- mode: text -*-
 =======================================
 
 
 Prerequisites
 -------------
 
-The packages that must be installed to build the gimp-print packages
+The packages that must be installed to build the gutenprint packages
 are listed in the Build-Depends field of the control file
 debian/control[.in].  However, these are the prerequisites to build
-the Debianised source.  Other things may be needed if building
+the Debianised source.  Other packages may be needed if building
 directly from CVS; it is less likely other tools will be needed if
 building from a distributed tarball.  Other tools that might
-potentially be needed are the latest versions of gettext and
-texi2html.
+potentially be needed are the latest versions of gettext, texi2html,
+docbook-utils and imagemagick.  build-essential and devscripts should
+also be installed in order to build Debian packages.
 
 
 General
@@ -56,12 +57,12 @@ Now proceed as for building from a tarball, below.
 Building this package from a tarball
 ------------------------------------
 
-Take the tarball gimp-print-VERSION.tar.gz, and copy it to an empty
-build directory.  Rename it to gimp-print_VERSION.orig.tar.gz.  This
+Take the tarball gutenprint-VERSION.tar.gz, and copy it to an empty
+build directory.  Rename it to gutenprint_VERSION.orig.tar.gz.  This
 is the `upstream' source.  Then extract this with:
 
-$ tar xfvz gimp-print_VERSION.orig.tar.gz
-$ cd gimp-print-VERSION
+$ tar xfvz gutenprint_VERSION.orig.tar.gz
+$ cd gutenprint-VERSION
 
 If needed, modify debian/changelog to change the version
 numbering. The version number should be the same as the package
@@ -80,13 +81,11 @@ $ dpkg-buildpackage -rfakeroot -us -uc
 or
 $ debuild -us -uc -L -i
 
-It should build without problems on Debian 3.0 (woody), but will no
-longer build on Debian 2.2 (potato) and current testing (sarge) and
-unstable distributions (sid).  For sarge or sid, please use the
-official Debian packages, or apply the Debian patch (.diff.gz).
+It should build without problems on Debian 3.0 (woody) and unstable,
+but will no longer build on Debian 2.2 (potato) current testing and
+unstable distributions.
 
 
 I hope you like it!
 
-Roger Leigh <roger@whinlatter.uklinux.net> -- Sat, 06 Dec 2003 16:47:46 +0000
-
+Roger Leigh <rleigh@debian.org> -- Sun, 12 Sep 2004 10:51:39 +0100
diff --git a/debian/changelog b/debian/changelog
index 43972fa..37d5d68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+gutenprint (4.3.99+cvs20050702-1) experimental; urgency=low
+
+  * New upstream release candidate (Closes: #293890).
+  * Renamed package to gutenprint.  The following packages were
+    renamed in consequence:
+    - cupsys-driver-gimpprint renamed to cupsys-driver-gutenprint
+    - foomatic-db-gimp-print renamed to foomatic-db-gutenprint
+    - gimpprint-doc renamed to gutenprint-doc
+    - gimpprint-locales renamed to gutenprint-locales
+    - ijsgimpprint renamed to ijsgutenprint
+    - libgimpprint renamed to libgutenprint
+    - libgimpprint-dev renamed to libgutenprint-dev
+    - libgimpprint-doc renamed to libgutenprint-doc
+  * New packages:
+    - libgimpprintui1-1 (GTK+ 1.2 UI library)
+    - libgimpprintui1-dev (GTK+ 1.2 UI library headers)
+    - libgimpprintui2-1 (GTK+ 2.0 UI library)
+    - libgimpprintui2-dev (GTK+ 2.0 UI library headers)
+  * Upgrade to Standards-Version 3.6.2
+  * Build-Depends:
+    - replace libreadline4-dev with libreadline5-dev
+    - add libcupsimage2-dev
+    - remove libtool
+  * debian/rules: add LIBRARYUI_VERSION, required to support
+    separate sonames for libgutenprint and libgutenprintui*.
+  * cupsys-driver-gutenprint:
+    - add cups-genppdupdate
+    - generates the PPDs in postinst, and removes them in prerm
+    - use new versioned CUPS executables
+  * libgutenprint: add modules and XML data.
+  * libgutenprint-doc:
+    - fix documentation installation for new API reference and
+      developer's reference.
+    - distribute gutenprint.pdf; gutenprint.ps is no longer created.
+  * Remove old and outdated manual pages.
+  * Provide versioned ijsgutenprint manual page, and unversioned
+    symlinks for the binary and manpage.
+  * Create a dummy cupsys-driver-gimpprint package to enable
+    upgrades from stable.
+  * Create a dummy ijsgimpprint package to enable upgrades from stable.
+  * Remove symlinks in debian directory.
+  * Don't autogenerate files in debian directory for anything but the
+    libgutenprintui package.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat,  2 Jul 2005 10:12:46 +0100
+
 gimp-print (4.2.7-10) unstable; urgency=high
 
   * cupsys-driver-gimpprint: Depend on a perl >= 5.8.0, otherwise
@@ -12,7 +58,7 @@ gimp-print (4.2.7-9) unstable; urgency=low
 
   * debian/cups-genppdupdate: Fix grepping of PPDs to work with PPD
     file names with shell metacharacters in them.  Patch from Martin
-    Pitt (Closes: #302434). 
+    Pitt (Closes: #302434).
 
  -- Roger Leigh <rleigh@debian.org>  Thu, 31 Mar 2005 22:10:41 +0100
 
diff --git a/debian/control b/debian/control
index be486b9..83469f6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,236 +1,329 @@
-Source: gimp-print
+Source: gutenprint
 Section: graphics
 Priority: optional
 Maintainer: Roger Leigh <rleigh@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), flex, gettext, zlib1g-dev, foomatic-db-engine (>= 3.0.1-1)
+Standards-Version: 3.6.2
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12)
 
-Package: cupsys-driver-gimpprint
+Package: gimp-print
 Architecture: any
-Section: graphics
-Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys-driver-gimpprint-data (= ${Source-Version}), cupsys (>= 1.1.23) | cups (>= 1.1.23)
-Recommends: gnome-gv | postscript-viewer
-Suggests: gimpprint-doc (>= ${Source-Version}), gimpprint-locales (>= ${Source-Version})
-Description: Gimp-Print printer drivers for CUPS
- This package includes a CUPS driver based on Gimp-Print.
- .
- The CUPS drivers contain all of the files needed to support
- photo-quality printing on any printer supported by Gimp-Print.  You
- can find out more about the Common UNIX Printing System ("CUPS"), an
- IPP-based printing system for UNIX/Linux, at:
+Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1)
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Description: print plugin for the GIMP
+ This package includes the Print plugin for the GIMP.
  .
-   http://www.cups.org
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
- .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: cupsys-driver-gimpprint-data
-Architecture: all
+Package: cupsys-driver-gimpprint
+Architecture: any
+Section: graphics
+Depends: cupsys-driver-gutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ cupsys-driver-gimpprint to cupsys-driver-gutenprint (its
+ successor).  It may be safely removed after upgrading.
+
+Package: cupsys-driver-gutenprint
+Architecture: any
 Section: graphics
-Depends: cupsys-driver-gimpprint (= ${Source-Version})
-Replaces: cupsys-driver-gimpprint (<< 4.2.6-4)
-Description: Gimp-Print printer drivers for CUPS
- This package includes Gimp-Print PPDs for CUPS.
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), libperlmenu-perl, cupsys (>= 1.1.23) | cups (>= 1.1.23)
+Recommends: gnome-gv | postscript-viewer
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Description: printer drivers for CUPS
+ This package includes a CUPS driver based on Gutenprint.
  .
  The CUPS drivers contain all of the files needed to support
- photo-quality printing on any printer supported by Gimp-Print.  You
+ photo-quality printing on any printer supported by Gutenprint.  You
  can find out more about the Common UNIX Printing System ("CUPS"), an
  IPP-based printing system for UNIX/Linux, at:
  .
    http://www.cups.org
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgimpprint1-dev
+Package: libgutenprint-dev
 Architecture: any
 Section: libdevel
-Depends: libgimpprint1 (= ${Source-Version})
-Provides: libgimpprint-dev
-Conflicts: libgimpprint-dev
-Replaces: libgimpprint-dev
-Suggests: libgimpprint1-doc (= ${Source-Version})
-Description: Development files for the Gimp-Print library
- This package contains the header files for the Gimp-Print library,
- along with a static version of libgimpprint.
+Depends: libgutenprint2 (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver library
+ This package contains the header files for the Gutenprint library,
+ along with a static version of libgutenprint.
  .
  Install this package if you wish to develop programs that use
- libgimpprint.
+ libgutenprint.
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgimpprint1-doc
+Package: libgutenprint-doc
 Architecture: all
 Section: doc
-Replaces: libgimpprint-doc
-Suggests: libgimpprint1-dev (= ${Source-Version})
-Description: Documentation for the Gimp-Print printer driver library
+Suggests: libgutenprint-dev (= ${Source-Version})
+Description: documentation for the Gutenprint printer driver library
  This package contains lots of info-files, DVI docs and other
- documentation about the Gimp-Print library for photo-quality
+ documentation about the Gutenprint library for photo-quality
  printing.
  .
  Install this package if you want to have lots of info about the
- Gimp-Print library when you're programming.
+ Gutenprint library when you're programming.
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgimpprint1
+Package: libgutenprint2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Suggests: gimpprint-locales (>= ${Source-Version})
-Description: The Gimp-Print printer driver library
- This package includes the Gimp-Print shared library, needed to
- run programs using Gimp-Print drivers.
+Suggests: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver library
+ This package includes the Gutenprint shared library, needed to
+ run programs using Gutenprint drivers.
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: gimpprint-locales
+Package: libgutenprintui1-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui1-1 (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.  This package is intended for use only by cinepaint
+ and gimp-1.2.
+ .
+ This is Gutenprint version 5.0.0-rc1, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui1-1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library.  libgutenprintui
+ contains GTK+ widgets which may be used for print dialogs etc. for
+ use with libgutenprint.
+ .
+ This is Gutenprint version 5.0.0-rc1, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui2-1 (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.
+ .
+ This is Gutenprint version 5.0.0-rc1, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library, necessary to run
+ gimp-print.  libgutenprintui contains GTK+ widgets which may be
+ used for print dialogs etc. for use with libgutenprint.
+ .
+ This is Gutenprint version 5.0.0-rc1, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: gutenprint-locales
 Architecture: all
 Section: libs
-Replaces: libgimpprint1 (<= 4.2.0-1)
-Description: Locale data files for Gimp-Print
- This package contains the i18n files of Gimp-Print, used by
- libgimpprint1, cupsys-driver-gimpprint and escputil.  It is also
- used by the Gimp Print plugin.
- It will be used by any programs which link with libgimpprint.
- .
- They are needed when you want the programs in Gimp-Print to print
+Description: locale data files for Gutenprint
+ This package contains the i18n files of Gutenprint, used by
+ 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 Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: gimpprint-doc
+Package: gutenprint-doc
 Architecture: all
 Section: doc
-Suggests: cupsys-driver-gimpprint (>= ${Source-Version}), foomatic-db-gimp-print (>= ${Source-Version}), gimp (>= 1.2.5), ijsgimpprint (>= ${Source-Version})
-Description: Users' Guide for Gimp-Print and CUPS
+Suggests: cupsys-driver-gutenprint (>= ${Source-Version}), foomatic-db-gutenprint (>= ${Source-Version}), gimp-print (>= ${Source-Version}), ijsgutenprint (>= ${Source-Version})
+Description: users' guide for Gutenprint and CUPS
  This package contains a user guide for programs using the
- Gimp-Print library for photographic quality printing.  Currently
+ Gutenprint library for photographic quality printing.  Currently
  this covers using the Print plugin for the GIMP and the Common Unix
  Printing System (CUPS).
  .
  The documentation is available in both HTML and PDF formats for
  on-line viewing and hardcopy.
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
 Package: escputil
 Architecture: any
 Section: utils
 Depends: ${shlibs:Depends}
-Suggests: gimpprint-locales (>= ${Source-Version})
-Description: A maintenance utility for Epson Stylus printers
+Suggests: gutenprint-locales (>= ${Source-Version})
+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 Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
- .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 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
  using GhostScript or CUPS.  These drivers provide printing quality
  for UNIX/Linux on a par with proprietary vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
 Package: ijsgimpprint
 Architecture: any
+Section: graphics
+Depends: cupsys-driver-gutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ ijsgimpprint to ijsgutenprint (its successor).  It may be
+ safely removed after upgrading.
+
+Package: ijsgutenprint
+Architecture: any
 Section: text
 Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14)
-Description: Inkjet Server - Ghostscript driver for Gimp-Print
- This package contains the ijsgimpprint binary which provides
- Ghostscript with a Gimp-Print driver, including all printers
- supported by Gimp-Print.
+Description: inkjet server - Ghostscript driver for Gutenprint
+ This package contains the ijsgutenprint binary which provides
+ Ghostscript with a Gutenprint driver, including all printers
+ supported by Gutenprint.
  .
- This is Gimp-Print version 4.2.7, a stable release in
- the 4.2 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: foomatic-db-gimp-print
+Package: foomatic-db-gutenprint
 Architecture: all
 Section: text
-Depends: foomatic-db, ijsgimpprint (>= ${Source-Version})
+Depends: foomatic-db, ijsgutenprint (>= ${Source-Version})
 Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9)
-Description: linuxprinting.org printer support - database for Gimp-Print printer drivers
+Description: linuxprinting.org printer support - database for Gutenprint printer drivers
  Foomatic is a printing system designed to make it easier to set up
  common printers for use with Debian (and other operating systems).
  It provides the "glue" between a print spooler (like CUPS or lpr) and
  your actual printer, by telling your computer how to process files
  sent to the printer.
  .
- This package includes support for printers using the Gimp-Print
+ This package includes support for printers using the Gutenprint
  printer driver suite.
  .
  Home Page: http://www.linuxprinting.org/
  .
- This is Gimp-Print version 4.2.7, an unstable
- development release in the 4.3 line.
+ This is Gutenprint version 5.0.0-rc1, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
-   
+ tasks.  Gutenprint was formerly known as Gimp-Print.
diff --git a/debian/control.in b/debian/control.in
index 0477861..51ff953 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,236 +1,329 @@
-Source: gimp-print
+Source: gutenprint
 Section: graphics
 Priority: optional
 Maintainer: Roger Leigh <rleigh@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), flex, gettext, zlib1g-dev, foomatic-db-engine (>= 3.0.1-1)
+Standards-Version: 3.6.2
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12)
 
-Package: cupsys-driver-gimpprint
+Package: gimp-print
 Architecture: any
-Section: graphics
-Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys-driver-gimpprint-data (= ${Source-Version}), cupsys (>= 1.1.23) | cups (>= 1.1.23)
-Recommends: gnome-gv | postscript-viewer
-Suggests: gimpprint-doc (>= ${Source-Version}), gimpprint-locales (>= ${Source-Version})
-Description: Gimp-Print printer drivers for CUPS
- This package includes a CUPS driver based on Gimp-Print.
- .
- The CUPS drivers contain all of the files needed to support
- photo-quality printing on any printer supported by Gimp-Print.  You
- can find out more about the Common UNIX Printing System ("CUPS"), an
- IPP-based printing system for UNIX/Linux, at:
+Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1)
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Description: print plugin for the GIMP
+ This package includes the Print plugin for the GIMP.
  .
-   http://www.cups.org
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
- .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: cupsys-driver-gimpprint-data
-Architecture: all
+Package: cupsys-driver-gimpprint
+Architecture: any
+Section: graphics
+Depends: cupsys-driver-gutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ cupsys-driver-gimpprint to cupsys-driver-gutenprint (its
+ successor).  It may be safely removed after upgrading.
+
+Package: cupsys-driver-gutenprint
+Architecture: any
 Section: graphics
-Depends: cupsys-driver-gimpprint (= ${Source-Version})
-Replaces: cupsys-driver-gimpprint (<< 4.2.6-4)
-Description: Gimp-Print printer drivers for CUPS
- This package includes Gimp-Print PPDs for CUPS.
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), libperlmenu-perl, cupsys (>= 1.1.23) | cups (>= 1.1.23)
+Recommends: gnome-gv | postscript-viewer
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Description: printer drivers for CUPS
+ This package includes a CUPS driver based on Gutenprint.
  .
  The CUPS drivers contain all of the files needed to support
- photo-quality printing on any printer supported by Gimp-Print.  You
+ photo-quality printing on any printer supported by Gutenprint.  You
  can find out more about the Common UNIX Printing System ("CUPS"), an
  IPP-based printing system for UNIX/Linux, at:
  .
    http://www.cups.org
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgimpprint#LIBRARY_VERSION#-dev
+Package: libgutenprint-dev
 Architecture: any
 Section: libdevel
-Depends: libgimpprint#LIBRARY_VERSION# (= ${Source-Version})
-Provides: libgimpprint-dev
-Conflicts: libgimpprint-dev
-Replaces: libgimpprint-dev
-Suggests: libgimpprint#LIBRARY_VERSION#-doc (= ${Source-Version})
-Description: Development files for the Gimp-Print library
- This package contains the header files for the Gimp-Print library,
- along with a static version of libgimpprint.
+Depends: libgutenprint#LIBRARY_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver library
+ This package contains the header files for the Gutenprint library,
+ along with a static version of libgutenprint.
  .
  Install this package if you wish to develop programs that use
- libgimpprint.
+ libgutenprint.
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgimpprint#LIBRARY_VERSION#-doc
+Package: libgutenprint-doc
 Architecture: all
 Section: doc
-Replaces: libgimpprint-doc
-Suggests: libgimpprint#LIBRARY_VERSION#-dev (= ${Source-Version})
-Description: Documentation for the Gimp-Print printer driver library
+Suggests: libgutenprint-dev (= ${Source-Version})
+Description: documentation for the Gutenprint printer driver library
  This package contains lots of info-files, DVI docs and other
- documentation about the Gimp-Print library for photo-quality
+ documentation about the Gutenprint library for photo-quality
  printing.
  .
  Install this package if you want to have lots of info about the
- Gimp-Print library when you're programming.
+ Gutenprint library when you're programming.
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgimpprint#LIBRARY_VERSION#
+Package: libgutenprint#LIBRARY_VERSION#
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Suggests: gimpprint-locales (>= ${Source-Version})
-Description: The Gimp-Print printer driver library
- This package includes the Gimp-Print shared library, needed to
- run programs using Gimp-Print drivers.
+Suggests: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver library
+ This package includes the Gutenprint shared library, needed to
+ run programs using Gutenprint drivers.
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: gimpprint-locales
+Package: libgutenprintui1-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui1-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.  This package is intended for use only by cinepaint
+ and gimp-1.2.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui1-#LIBRARYUI_VERSION#
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library.  libgutenprintui
+ contains GTK+ widgets which may be used for print dialogs etc. for
+ use with libgutenprint.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui2-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-#LIBRARYUI_VERSION#
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library, necessary to run
+ 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 beta
+ development release in the 5.0 line.
+ .
+ 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 vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: gutenprint-locales
 Architecture: all
 Section: libs
-Replaces: libgimpprint1 (<= 4.2.0-1)
-Description: Locale data files for Gimp-Print
- This package contains the i18n files of Gimp-Print, used by
- libgimpprint#LIBRARY_VERSION#, cupsys-driver-gimpprint and escputil.  It is also
- used by the Gimp Print plugin.
- It will be used by any programs which link with libgimpprint.
- .
- They are needed when you want the programs in Gimp-Print to print
+Description: locale data files for Gutenprint
+ This package contains the i18n files of Gutenprint, used by
+ 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 Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: gimpprint-doc
+Package: gutenprint-doc
 Architecture: all
 Section: doc
-Suggests: cupsys-driver-gimpprint (>= ${Source-Version}), foomatic-db-gimp-print (>= ${Source-Version}), gimp (>= 1.2.5), ijsgimpprint (>= ${Source-Version})
-Description: Users' Guide for Gimp-Print and CUPS
+Suggests: cupsys-driver-gutenprint (>= ${Source-Version}), foomatic-db-gutenprint (>= ${Source-Version}), gimp-print (>= ${Source-Version}), ijsgutenprint (>= ${Source-Version})
+Description: users' guide for Gutenprint and CUPS
  This package contains a user guide for programs using the
- Gimp-Print library for photographic quality printing.  Currently
+ Gutenprint library for photographic quality printing.  Currently
  this covers using the Print plugin for the GIMP and the Common Unix
  Printing System (CUPS).
  .
  The documentation is available in both HTML and PDF formats for
  on-line viewing and hardcopy.
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
 Package: escputil
 Architecture: any
 Section: utils
 Depends: ${shlibs:Depends}
-Suggests: gimpprint-locales (>= ${Source-Version})
-Description: A maintenance utility for Epson Stylus printers
+Suggests: gutenprint-locales (>= ${Source-Version})
+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 Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
- .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 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
  using GhostScript or CUPS.  These drivers provide printing quality
  for UNIX/Linux on a par with proprietary vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
 Package: ijsgimpprint
 Architecture: any
+Section: graphics
+Depends: cupsys-driver-gutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ ijsgimpprint to ijsgutenprint (its successor).  It may be
+ safely removed after upgrading.
+
+Package: ijsgutenprint
+Architecture: any
 Section: text
 Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14)
-Description: Inkjet Server - Ghostscript driver for Gimp-Print
- This package contains the ijsgimpprint binary which provides
- Ghostscript with a Gimp-Print driver, including all printers
- supported by Gimp-Print.
+Description: inkjet server - Ghostscript driver for Gutenprint
+ This package contains the ijsgutenprint binary which provides
+ Ghostscript with a Gutenprint driver, including all printers
+ supported by Gutenprint.
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, a stable release in
- the 4.2 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
+ tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: foomatic-db-gimp-print
+Package: foomatic-db-gutenprint
 Architecture: all
 Section: text
-Depends: foomatic-db, ijsgimpprint (>= ${Source-Version})
+Depends: foomatic-db, ijsgutenprint (>= ${Source-Version})
 Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9)
-Description: linuxprinting.org printer support - database for Gimp-Print printer drivers
+Description: linuxprinting.org printer support - database for Gutenprint printer drivers
  Foomatic is a printing system designed to make it easier to set up
  common printers for use with Debian (and other operating systems).
  It provides the "glue" between a print spooler (like CUPS or lpr) and
  your actual printer, by telling your computer how to process files
  sent to the printer.
  .
- This package includes support for printers using the Gimp-Print
+ This package includes support for printers using the Gutenprint
  printer driver suite.
  .
  Home Page: http://www.linuxprinting.org/
  .
- This is Gimp-Print version #UPSTREAM_VERSION#, an unstable
- development release in the 4.3 line.
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
  .
- Gimp-Print is the print facility for the Gimp, and in addition a
+ 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 vendor-supplied drivers in
  many cases, and can be used for many of the most demanding printing
- tasks.
-   
+ tasks.  Gutenprint was formerly known as Gimp-Print.
diff --git a/debian/copyright b/debian/copyright
index aba547e..02805bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL file.
 
-The User's Guide (in the gimpprint-doc package) is licensed under the
+The User's Guide (in the gutenprint-doc package) is licensed under the
 terms of the GNU Free Documentation License, version 1.1.  The full
 license text is contained within the manual.
 
diff --git a/debian/cups-genppdupdate b/debian/cups-genppdupdate
deleted file mode 100644
index cbda242..0000000
--- a/debian/cups-genppdupdate
+++ /dev/null
@@ -1,537 +0,0 @@
-#! /usr/bin/perl -w
-# $Id: cups-genppdupdate.in,v 1.12 2003/12/17 03:12:48 rlk Exp $
-# Update CUPS PPDs for Gimp-Print queues.
-# Copyright (C) 2002-2004 Roger Leigh (rleigh@debian.org)
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-use strict;
-use Getopt::Std;
-use Fcntl qw(:mode);
-use File::Temp qw(:POSIX);
-use File::Copy qw(mv);
-
-sub parse_options ();
-sub update_ppd ($); # Original PPD filename
-sub find_ppd ($$$$); # Gimp-Print Filename, driver, language (e.g. en, sv),
-		     # region (e.g. GB, DE)
-sub get_default_types (*); # Source PPD FH
-sub get_defaults (*); # Source PPD FH
-sub get_options (*\%); # Source PPD FH, default_types hash ref
-
-our $opt_d; # Debug mode
-our $opt_h; # Help
-our $opt_n; # No action
-our $opt_q; # Quiet mode
-our $opt_s; # Source PPD location
-our $opt_v; # Verbose mode
-
-my $debug = 0;
-my $verbose = 0;   # Verbose output
-if ($debug) {
-    $verbose = 1;
-}
-my $quiet = 0;     # No output
-my $no_action = 0; # Don't output files
-my $version = "4.2";
-
-my $ppd_dir = "/etc/cups/ppd"; # Location of in-use CUPS PPDs
-my $ppd_root_dir = "/usr/share/cups/model";
-my $ppd_base_dir = "$ppd_root_dir/gimp-print/$version"; # Available PPDs
-my $gzext = ".gz";
-my $updated_ppd_count = 0;
-
-my @ppd_files; # A list of in-use Gimp-Print PPD files
-
-# Used to convert a language name to its two letter code
-my %languagemappings = (
-			"chinese"    => "cn",
-			"danish"     => "da",
-			"dutch"      => "nl",
-			"english"    => "en",
-			"finnish"    => "fi",
-			"french"     => "fr",
-			"german"     => "de",
-			"greek"      => "el",
-			"italian"    => "it",
-			"japanese"   => "jp",
-			"norwegian"  => "no",
-			"polish"     => "pl",
-			"portuguese" => "pt",
-			"russian"    => "ru",
-			"slovak"     => "sk",
-			"spanish"    => "es",
-			"swedish"    => "sv",
-			"turkish"    => "tr"
-);
-
-
-# Check command-line options...
-
-parse_options();
-
-
-# Set a secure umask...
-
-umask 0177;
-
-
-# Find all in-use Gimp-Print PPD files...
-
-my @ppdglob = glob("$ppd_dir/*.{ppd,PPD}");
-if (@ppdglob) {
-    open PPDFILES, '-|', 'grep', '-i', '-l', 'Gimp-Print', @ppdglob or die "can't grep $ppd_dir/*: $!";
-    while (<PPDFILES>) {
-	chomp;
-	push @ppd_files,  $_;
-    }
-    close PPDFILES or ($! == 0) or die "can't close grep pipe: $!";
-}
-
-
-# Exit if there are not files to update...
-
-if (!@ppd_files) {
-    print STDOUT "No Gimp-Print PPD files to update.\n";
-    exit (0);
-}
-
-# Update each of the Gimp-Print PPDs, where possible...
-
-foreach (@ppd_files) {
-    $updated_ppd_count += update_ppd($_);
-
-}
-
-if (!$quiet || $verbose) {
-    if ($updated_ppd_count > 0) {
-	print STDOUT "Updated $updated_ppd_count PPD files.  Restart cupsd for the changes to take effect.\n";
-	exit (0);
-    } else {
-	print STDOUT "Failed to update any PPD files\n";
-	exit (0);
-    }
-}
-
-
-
-sub parse_options () {
-    getopts("dhnqs:v");
-
-    if ($opt_n) {
-	$no_action = 1;
-    }
-    if ($opt_d) {
-	$debug = 1;
-    }
-    if ($opt_s) {
-	if (-d $opt_s) {
-	    $ppd_base_dir = "$opt_s";
-	}
-	else {
-	    die "$opt_s: invalid directory: $!";
-	}
-    }
-    if ($opt_v) {
-	$verbose = 1;
-	$quiet = 0;
-    }
-    if ($opt_q) {
-	$verbose = 0;
-	$quiet = 1;
-    }
-    if ($opt_h) {
-	print "Usage: $0 [OPTION]...\n";
-	print "Update CUPS+Gimp-Print PPD files.\n\n";
-        print "  -d          Enable debugging\n";
-        print "  -h          Display this help text\n";
-	print "  -n          No-action.  Don't overwrite any PPD files.\n";
-	print "  -q          Quiet mode.  No messages except errors.\n";
-	print "  -s ppd_dir  Use ppd_dir as the source PPD directory.\n";
-	print "  -v          Verbose messages.\n";
-	exit (0);
-    }
-}
-
-
-# Update the named PPD file.
-sub update_ppd ($) {
-    my $ppd_source_filename = $_;
-
-    open ORIG, $_ or die "$_: can't open PPD file: $!";
-    seek (ORIG, 0, 0) or die "can't seek to start of PPD file";
-    if ($debug) {
-	print "Source Filename: $ppd_source_filename\n";
-    }
-    # Get the `PCFileName'; the new source PPD will have the same name.
-    my ($filename) = "";
-    my ($driver) = "";
-    my ($gimpprintdriver) = "";
-    my ($locale) = "";
-    my ($lingo) = "";
-    my ($region) = "";
-    my ($valid) = 1;
-    while (<ORIG>) {
-	if (/\*StpLocale:/) {
-	    ($locale) = m/^\*StpLocale:\s\"*(.*)\"$/;
-	    $valid = 1;
-	}
-	if (/\*LanguageVersion/) {
-	    ($lingo) = m/^\*LanguageVersion:\s*(.*)$/;
-	}
-	if (/^\*StpDriverName:/ ) {
-	    ($driver) = m/^\*StpDriverName:\s*\"(.*)\"$/;
-	    $valid = 1;
-	}
-	if (/\*%End of / && $driver eq "") {
-	    ($driver) = m/^\*%End of\s*(.*).ppd$/;
-	}
-	if (/^\*StpPPDLocation:/ ) {
-	    ($filename) = m/^\*StpPPDLocation:\s*\"(.*)\"$/;
-	    $valid = 1;
-	}
-	if (/^\*%Gimp-Print Filename:/) {
-	    $valid = 1;
-	}
-    }
-    if (! $valid) {
-	print STDERR "$ppd_source_filename: this PPD file cannot be upgraded automatically (only files based on Gimp-Print 4.3.21 and newer can be)\n";
-	return 0;
-    }
-    if ($debug) {
-	print "Gimp-Print Filename: $filename\n";
-	print "Locale: $locale\n";
-	print "Language: $lingo\n";
-	print "Driver: $driver\n";
-    }
-    if ($locale) {
-	# Split into the language and territory.
-	($locale, $region) = split(/-/, $locale);
-    } else {
-	# Split into the language and territory.
-	($locale, $region) = split(/-/, $lingo);
-	# Convert language into language code.
-	$locale = $languagemappings{"\L$lingo"};
-	if (!defined($locale)) {
-	    $locale = "C"; # Fallback if there isn't one.
-	}
-    }
-    if (! defined($region)) {
-	$region = "";
-    }
-    if ($debug) {
-	print "Locale: $locale\n";
-	print "Region: $region\n";
-    }
-
-    # Search for a PPD matching our criteria...
-
-    my $source = find_ppd($filename, $driver, $locale, $region);
-    if (!defined($source)) {
-        # There wasn't a valid source PPD file, so give up.
-        print STDERR "$ppd_source_filename: no valid candidate for replacement.  Skipping\n";
-        print STDERR "$ppd_source_filename: please upgrade this PPD manually\n";
-	return 0;
-    }
-    if ($debug) {
-	print "Candidate PPD: $source\n";
-    }
-
-
-    # Read in the new PPD, decompressing it if needed...
-
-    my $source_data;
-
-    my $suffix = "\\" . $gzext; # Add '\', so m// matches the '.'.
-    if ($source =~ m/.gz$/) { # Decompress input buffer
-	open GZIN, "gunzip -c $source |"
-	    or die "$_: can't open for decompression: $!";
-	while (<GZIN>) {
-	    $source_data .= $_;
-	}
-	close GZIN;
-    }
-    else {
-	open SOURCE, $source
-	    or die "$source: can't open source file: $!";
-	binmode SOURCE;
-	my $source_size = (stat(SOURCE))[7];
-	read (SOURCE, $source_data, $source_size)
-	    or die "$source: error reading source: $!";
-	close SOURCE or die "$source: can't close file: $!";
-    }
-
-    # Save new PPD in a temporary file, for processing...
-
-    my($tmpfile, $tmpfilename) = tmpnam();
-    chown(0, 0, $tmpfilename); # root.root
-    chmod(0644, $tmpfilename);
-    unlink $tmpfilename or warn "can't unlink temporary file $tmpfile: $!\n";
-    print $tmpfile $source_data;
-
-
-
-
-    # Extract the default values from the original PPD...
-
-    my %orig_default_types = get_default_types(ORIG);
-    my %new_default_types = get_default_types($tmpfile);
-    my %defaults = get_defaults(ORIG);
-    my %options = get_options($tmpfile, %new_default_types);
-
-
-    # Close original and temporary files...
-
-    close ORIG or die "$_: can't close file: $!";
-    close $tmpfile or die "can't close temporary file $tmpfile: $!";
-
-
-    if ($debug) {
-	print "Original Default Types:\n";
-	foreach (sort keys %orig_default_types) {
-	    print "  $_: $orig_default_types{$_}\n";
-	}
-	print "New Default Types:\n";
-	foreach (sort keys %new_default_types) {
-	    print "  $_: $new_default_types{$_}\n";
-	}
-	print "Defaults:\n";
-	foreach (sort keys %defaults) {
-	    print "  $_: $defaults{$_}\n";
-	}
-	print "Options:\n";
-	foreach (sort keys %options) {
-	    print "  $_:  ";
-	    foreach my $opt (@{$options{$_}}) {
-		print "$opt ";
-	    }
-	    print "\n";
-	}
-
-    }
-
-    # Update source buffer with old defaults...
-
-    # Loop through each default in turn.
-default_loop:
-    foreach (sort keys %defaults) {
-	my $default_option = $_;
-	my $option;
-	($option = $_) =~ s/Default//; # Strip off `Default'
-	# Check method is valid
-	my $orig_method = $orig_default_types{$option};
-	my $new_method = $new_default_types{$option};
-	if ((!defined($orig_method) || !defined($new_method)) ||
-	    $orig_method ne $new_method) {
-	    next;
-	}
-	if ($new_method eq "PickOne") {
-            # Check the old setting is valid
-	    foreach (@{$options{$option}}) {
-		if ($defaults{$default_option} eq $_) { # Valid option
-		    # Set the option in the new PPD
-		    $source_data =~ s/\*($default_option).*/*$1:$defaults{$default_option}/m;
-		    if ($verbose) {
-			print "$ppd_source_filename: Set *$default_option to $defaults{$default_option}\n";
-		    }
-		    next default_loop;
-		}
-	    }
-	    printf STDERR
-		"$ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Skipped.\n";
-	    next;
-	}
-	print STDERR
-	    "$ppd_source_filename: PPD OpenUI method $new_default_types{$_} not understood.  Skipped\n";
-    }
-
-
-    # Write new PPD...
-
-    my $tmpnew = "${ppd_source_filename}.new";
-    if (! open NEWPPD, "> $tmpnew") {
-	warn "Can't open $tmpnew for writing: $!\n";
-	return 0;
-    }
-    chown(0, 0, $tmpnew);	# Bad idea to hardcode this...
-    chmod(0644, $tmpnew);	# Bad idea to hardcode this...
-    print NEWPPD $source_data;
-    if (! close NEWPPD) {
-	warn "Can't close ${tmpnew}.new for writing: $!\n";
-	unlink $tmpnew;
-	return 0;
-    }
-
-    if (! rename $tmpnew, $ppd_source_filename) {
-	warn "Can't rename $tmpnew to $ppd_source_filename: $!\n";
-	unlink $tmpnew;
-	return 0;
-    }
-
-    if (!$quiet || $verbose) {
-	print STDOUT "Updated $ppd_source_filename using $source\n";
-    }
-    return 1;
-    # All done!
-}
-
-# Find a suitable source PPD file
-sub find_ppd ($$$$) {
-    my($gimpprintfilename, $drivername, $lang, $region) = @_;
-    my $file; # filename to return
-    my ($key) = '^\\*FileVersion:[ 	]*"4.2.7"$';
-    my ($lingo, $suffix, $base, $basedir);
-    my ($current_best_file, $current_best_time);
-    my ($stored_name, $stored_dir);
-    $stored_name = $gimpprintfilename;
-    $stored_name =~ s,.*/([^/]*)(.gz)?$,$1,;
-    $stored_dir = $gimpprintfilename;
-    $stored_dir =~ s,(.*)/([^/]*)$,$1,;
-
-    $current_best_file = "";
-    $current_best_time = 0;
-
-    # All possible candidates, in order of usefulness and gzippedness
-    foreach $lingo ("${lang}_${region}/",
-		    "$lang/",
-		    "en/",
-		    "C/",
-		    "") {
-	foreach $suffix (".ppd$gzext",
-			 ".ppd") {
-	    foreach $base ("${drivername}.$version",
-                           "stp-${drivername}.$version",
-			   $stored_name,
-			   $drivername) {
-		foreach $basedir ($ppd_base_dir,
-				  $stored_dir,
-				  $ppd_root_dir) {
-                    if (! $basedir || ! $base) { next; }
-		    my ($fn) = "$basedir/$lingo$base$suffix";
-		    if ($debug) {
-                        print "Trying $fn for $gimpprintfilename, $lang, $region\n";
-                    }
-# Check that it is a regular file, owned by root.root, not writable
-# by other, and is readable by root.  i.e. the file is secure.
-		    my @sb = stat $fn or next;
-		    if (S_ISREG($sb[2]) && ($sb[4] == 0) && ($sb[5] == 0)) {
-#			!(S_IWOTH & $sb[2]) && (S_IRUSR & $sb[2])) {
-			# Check that the file is a valid Gimp-Print PPD file
-			# of the correct version.
-			my $file_version;
-			if ($fn =~ m/\.gz$/) {
-			    $file_version = `gunzip -c $fn | grep '$key'`;
-			} else {
-			    $file_version = `cat $fn | grep '$key'`;
-			}
-			if ($file_version ne "") {
-                            if ($debug) {
-			        print "   Format valid: time $sb[9] best $current_best_time prev $current_best_file cur $fn!\n";
-			    }
-			    if ($sb[9] > $current_best_time) {
-				$current_best_time = $sb[9];
-				$current_best_file = $fn;
-			    }
-			} elsif ($debug) {
-			    print "   Format invalid\n";
-			}
-		    }
-		    else {
-			if (! -d $fn && ! /\/$/) {
-			    print STDERR "$fn: not a regular file, or insecure ownership and permissions.  Skipped\n";
-			}
-		    }
-		}
-	    }
-	}
-    }
-    if ($current_best_file) {
-        return $current_best_file;
-    }
-# Yikes!  Cannot find a valid PPD file!
-    return undef;
-}
-
-# Return the default options from the given PPD filename
-sub get_default_types(*) {
-    my $fh = $_[0];
-    my %default_types;
-
-    # Read each line of the original PPD file, and store all OpenUI
-    # names and their types in a hash...
-    seek ($fh, 0, 0) or die "can't seek to start of PPD file";
-    while (<$fh>) {
-	if ( m/^\*OpenUI/ ) {
-	    chomp;
-	    my ($key, $value) = /^\*OpenUI\s\*([[:alnum:]]+).*:\s([[:alnum:]]+)/;
-	    if ($key && $value) {
-		$default_types{$key}=$value;
-	    }
-	}
-    }
-    return %default_types;
-}
-
-
-# Return the default options from the given PPD filename
-sub get_defaults(*) {
-    my $fh = $_[0];
-    my %defaults;
-
-    # Read each line of the original PPD file, and store all default
-    # names and their values in a hash...
-    seek ($fh, 0, 0) or die "can't seek to start of PPD file";
-    while (<$fh>) {
-	if ( m/^\*Default/ ) {
-	    chomp;
-	    my($key, $value) = /^\*([[:alnum:]]+):\s*([[:alnum:]]+)/;
-	    if ($key && $value) {
-		$defaults{$key}=$value;
-	    }
-	}
-    }
-    return %defaults;
-}
-
-
-# Return the available options from the given PPD filename
-sub get_options(*\%) {
-    my $fh = $_[0];
-    my $validopts = $_[1];
-    my %options;
-
-    # For each valid option name, grab each valid option for that name
-    # and store in a hash of arrays...
-
-    foreach (sort keys %$validopts) {
-	my $tmp = $_;
-	my @optionlist;
-
-	seek ($fh, 0, 0) or die "can't seek to start of PPD file";
-	while (<$fh>) {
-	    if ( m/^\*$tmp/ ) {
-		chomp;
-		my ($value) = /^\*$tmp\s*([[:alnum:]]+)[\/:]/;
-		if ($value) {
-		    push @optionlist, $value;
-		}
-	    }
-	}
-	if (@optionlist) {
-	    $options{$tmp} = [ @optionlist ];
-	}
-    }
-    return %options;
-}
diff --git a/debian/cups-genppdupdate.8.in b/debian/cups-genppdupdate.8.in
deleted file mode 100644
index f5d635a..0000000
--- a/debian/cups-genppdupdate.8.in
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" $Id: cups-genppdupdate.8.in,v 1.2 2003/08/22 23:40:36 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <rl117@york.ac.uk>
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2, or (at your option)
-.\" any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-.TH CUPS\-GENPPDUPDATE "8" "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-cups\-genppdupdate \- update CUPS+Gimp\-Print PPD files
-.SH SYNOPSIS
-.B cups\-genppdupdate
-[\fI\-h\fP]
-[\fI\-n\fP]
-[\fI\-q\fP | \fI\-v\fP]
-[\fI\-s ppd-directory\fP]
-.SH DESCRIPTION
-\fBcups\-genppdupdate\fP regenerates the \fIGimp-Print\fP PPD files in use by
-CUPS, using the PPD files under \fI@cups_conf_datadir@/model/gimp\-print\fP as
-templates.  The new PPD file replaces the old PPD file under
-\fI@cups_conf_serverroot@/ppd\fP, but all the options set in the old PPD will
-be merged into the new PPD, provided that they are still valid in the new file.
-.PP
-cups\-genppdupdate does \fBnot\fP restart cupsd.  cupsd will need manually
-reloading (or send SIGHUP) once cups\-genppdupdate has completed.
-.SH OPTIONS
-.TP
-.B \-h
-Show a help message.
-.TP
-.B \-n
-No action.  The program will run, but the old PPD files will not be replaced.
-.TP
-.B \-q
-Quiet mode.  No messages will be issued, apart from errors.
-.TP
-.B \-v
-Verbose mode.  More informative messages will be issued.  Note that extremely
-verbose output may be turned on by setting $debug=1 in the source, but this
-output will not be of use to the average user.
-.TP
-.B \-s \fIppd-directory\fP
-Use \fIppd-directory\fP as the base directory to read PPD files from.  By
-default, the base directory is \fP@cups_conf_datadir@/model/gimp\-print\fP.
-Under this directory, the PPD files are located in subdirectories according to
-language code and territory.
-.SH SEE ALSO
-.BR cups\-genppd (8),
-.BR cups\-genppdconfig (8),
-gimpprint.info,
-CUPS Software Administrators Manual, http://localhost:631/documentation.html
-.SH COPYRIGHT
-Copyright \(co  2002\-2003 Roger Leigh (roger@whinlatter.uklinux.net)
-.PP
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License, version 2, as
-published by the Free Software Foundation.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/debian/cupsys-driver-gimpprint-data.docs b/debian/cupsys-driver-gimpprint-data.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/cupsys-driver-gimpprint-data.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/cupsys-driver-gimpprint-data.install b/debian/cupsys-driver-gimpprint-data.install
deleted file mode 100644
index f8e4de4..0000000
--- a/debian/cupsys-driver-gimpprint-data.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/install/usr/share/cups/model/C/*             usr/share/cups/model/gimp-print/4.2
diff --git a/debian/cupsys-driver-gimpprint.install b/debian/cupsys-driver-gimpprint.install
deleted file mode 100644
index c0bd1a3..0000000
--- a/debian/cupsys-driver-gimpprint.install
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/cups-genppdupdate                            usr/sbin
-debian/cups-genppdupdate.8                          usr/share/man/man8
-debian/install/etc/cups                             etc
-debian/install/usr/bin/cups-calibrate               usr/bin
-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
-samples/profile.jpg                                 usr/share/doc/cupsys-driver-gimpprint/samples
diff --git a/debian/cupsys-driver-gimpprint.docs b/debian/cupsys-driver-gutenprint.docs
index 0b55f7f..0b55f7f 100644
--- a/debian/cupsys-driver-gimpprint.docs
+++ b/debian/cupsys-driver-gutenprint.docs
diff --git a/debian/cupsys-driver-gutenprint.install b/debian/cupsys-driver-gutenprint.install
new file mode 100644
index 0000000..291f653
--- /dev/null
+++ b/debian/cupsys-driver-gutenprint.install
@@ -0,0 +1,12 @@
+debian/install/etc/cups                                etc
+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/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/cupsys-driver-gutenprint/samples
diff --git a/debian/cupsys-driver-gimpprint.postinst b/debian/cupsys-driver-gutenprint.postinst
index d3a2df3..093ea25 100644
--- a/debian/cupsys-driver-gimpprint.postinst
+++ b/debian/cupsys-driver-gutenprint.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys-driver-gimpprint
+# postinst script for cupsys-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -26,13 +26,14 @@ set -e
 
 if [ "$1" = "configure" ]; then
 # Upgrade in-use PPD files
-  /usr/sbin/cups-genppdupdate
+    /usr/sbin/cups-genppdconfig.5.0 -u
+    /usr/sbin/cups-genppdupdate.5.0
 # Restart CUPSys (to register new and updated PPDs)
-  [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload
+    [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload
 elif [ "$1" = "abort-upgrade" -o "$1" = "abort-remove" -o "$1" = "abort-deconfigure" ]; then :
 else
-  echo "postinst called with unknown argument \`$1'" >&2
-  exit 0
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 0
 fi
 
 # dh_installdeb will replace this with shell code automatically
diff --git a/debian/cupsys-driver-gimpprint.postrm b/debian/cupsys-driver-gutenprint.postrm
index 2127ddb..63c1b49 100644
--- a/debian/cupsys-driver-gimpprint.postrm
+++ b/debian/cupsys-driver-gutenprint.postrm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for gimp-print
+# postrm script for cupsys-driver-gutenprint
 #
 # see: dh_installdeb(1)
 
@@ -17,12 +17,15 @@ set -e
 # for details, see /usr/doc/packaging-manual/
 
 if [ "$1" = remove ]; then
-        [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload
+    # Remove generated PPDs
+    rm -rf /usr/share/cups/model/gutenprint/5.0
+    [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload
 fi
 
 if [ "$1" = purge ]; then
-        # Remove /etc/cups if it is empty
-        rmdir --ignore-fail-on-non-empty /etc/cups
+    # Remove /etc/cups if it is empty
+    rmdir --ignore-fail-on-non-empty /etc/cups
+    rmdir --ignore-fail-on-non-empty /usr/share/cups/model/gutenprint
 fi
 
 # dh_installdeb will replace this with shell code automatically
diff --git a/debian/foomatic-db-gimp-print.install b/debian/foomatic-db-gimp-print.install
deleted file mode 100644
index 000d417..0000000
--- a/debian/foomatic-db-gimp-print.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/install/usr/share/foomatic/db/source/driver/gimp-print-ijs.xml  usr/share/foomatic/db/source/driver
-debian/install/usr/share/foomatic/db/source/opt/gimp-print-ijs*        usr/share/foomatic/db/source/opt
diff --git a/debian/foomatic-db-gutenprint.install b/debian/foomatic-db-gutenprint.install
new file mode 100644
index 0000000..dc49f93
--- /dev/null
+++ b/debian/foomatic-db-gutenprint.install
@@ -0,0 +1,2 @@
+debian/install/usr/share/foomatic/db/source/driver/gutenprint*.xml  usr/share/foomatic/db/source/driver
+debian/install/usr/share/foomatic/db/source/opt/gutenprint-ijs*     usr/share/foomatic/db/source/opt
diff --git a/debian/gimp-print.docs b/debian/gimp-print.docs
new file mode 100644
index 0000000..7610b61
--- /dev/null
+++ b/debian/gimp-print.docs
@@ -0,0 +1,3 @@
+README
+doc/*.html
+doc/*.png
diff --git a/debian/gimp-print.install b/debian/gimp-print.install
new file mode 100644
index 0000000..8932be3
--- /dev/null
+++ b/debian/gimp-print.install
@@ -0,0 +1,2 @@
+debian/install/usr/lib/gimp/2.0/plug-ins/print  usr/lib/gimp/2.0/plug-ins
+samples/*.png                                   usr/share/doc/gimp-print/samples
diff --git a/debian/gimp1.2-print.postrm b/debian/gimp-print.postrm
index 3d86f8f..87c41e4 100644
--- a/debian/gimp1.2-print.postrm
+++ b/debian/gimp-print.postrm
@@ -19,9 +19,9 @@ set -e
 case "$1" in
        purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
            if [ remove = "$1" ]; then
-               dpkg-divert --package gimp1.2-print --remove --rename \
-                  --divert /usr/lib/gimp/1.2/print.orig \
-	          /usr/lib/gimp/1.2/plug-ins/print
+               dpkg-divert --package gimp-print --remove --rename \
+                  --divert /usr/lib/gimp/2.0/print.orig \
+	          /usr/lib/gimp/2.0/plug-ins/print
            fi
         ;;
 
diff --git a/debian/gimp1.2-print.preinst b/debian/gimp-print.preinst
index b41a140..36782c3 100644
--- a/debian/gimp1.2-print.preinst
+++ b/debian/gimp-print.preinst
@@ -14,9 +14,9 @@ set -e
 case "$1" in
     install|upgrade)
         if [ install = "$1" ]; then
-           dpkg-divert --package gimp1.2-print --add --rename \
-	      --divert /usr/lib/gimp/1.2/print.orig \
-	      /usr/lib/gimp/1.2/plug-ins/print
+           dpkg-divert --package gimp-print --add --rename \
+	      --divert /usr/lib/gimp/2.0/print.orig \
+	      /usr/lib/gimp/2.0/plug-ins/print
 	fi
     ;;
 
diff --git a/debian/gimp1.2-print.install b/debian/gimp1.2-print.install
deleted file mode 100644
index a645d02..0000000
--- a/debian/gimp1.2-print.install
+++ /dev/null
@@ -1,3 +0,0 @@
-doc/*.html     usr/share/doc/gimp1.2-print/html
-doc/*.png      usr/share/doc/gimp1.2-print/html
-samples/*.png  usr/share/doc/gimp1.2-print/samples
diff --git a/debian/gimpprint-doc.doc-base b/debian/gimpprint-doc.doc-base
deleted file mode 100644
index 5d59948..0000000
--- a/debian/gimpprint-doc.doc-base
+++ /dev/null
@@ -1,15 +0,0 @@
-Document: gimpprint-doc
-Title: The User's Guide to the Gimp-Print Top Quality Printer Drivers
-Author: Andy Stewart
-Abstract: The Gimp-Print Top Quality Printer Drivers (hereafter
- called Gimp-Print) are a set of printer drivers written to
- take advantage of the full capabilities of a wide range of
- printers. This document will explain how to use the Gimp-Print
- software to achieve high quality printouts from the GIMP (GNU
- Image Manipulation Program) and CUPS (Common Unix Printing
- System).
-Section: Apps/Graphics
-
-Format: HTML
-Index: /usr/share/doc/gimpprint-doc/html/index.html
-Files: /usr/share/doc/gimpprint-doc/html/*
diff --git a/debian/gimpprint-doc.install b/debian/gimpprint-doc.install
deleted file mode 100644
index 7df6663..0000000
--- a/debian/gimpprint-doc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/install/usr/share/gimp-print/doc/*.pdf               usr/share/doc/gimpprint-doc
-debian/install/usr/share/gimp-print/doc/html                usr/share/doc/gimpprint-doc
-debian/install/usr/share/man/man7/gimpprint-color.7         usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-dithers.7       usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-imagetypes.7    usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-inktypes.7      usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-mediasizes.7    usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-mediasources.7  usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-mediatypes.7    usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-models.7        usr/share/man/man7
-debian/install/usr/share/man/man7/gimpprint-resolutions.7   usr/share/man/man7
diff --git a/debian/gutenprint-doc.doc-base b/debian/gutenprint-doc.doc-base
new file mode 100644
index 0000000..b7a0cd2
--- /dev/null
+++ b/debian/gutenprint-doc.doc-base
@@ -0,0 +1,14 @@
+Document: gutenprint-doc
+Title: The User's Guide to the Gutenprint Top Quality Printer Drivers
+Author: Andy Stewart
+Abstract: The Gutenprint Top Quality Printer Drivers are a set of
+ printer drivers written to take advantage of the full capabilities
+ of a wide range of printers. This document will explain how to use
+ the Gutenprint software to achieve high quality printouts from the
+ GIMP (GNU Image Manipulation Program) and CUPS (Common Unix
+ Printing System).
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/gutenprint-doc/html/index.html
+Files: /usr/share/doc/gutenprint-doc/html/*
diff --git a/debian/gutenprint-doc.install b/debian/gutenprint-doc.install
new file mode 100644
index 0000000..d481933
--- /dev/null
+++ b/debian/gutenprint-doc.install
@@ -0,0 +1,2 @@
+debian/install/usr/share/gutenprint/doc/*.pdf                usr/share/doc/gutenprint-doc
+debian/install/usr/share/gutenprint/doc/html                 usr/share/doc/gutenprint-doc
diff --git a/debian/gimpprint-locales.install b/debian/gutenprint-locales.install
index 525d334..525d334 100644
--- a/debian/gimpprint-locales.install
+++ b/debian/gutenprint-locales.install
diff --git a/debian/ijsgimpprint.install b/debian/ijsgimpprint.install
deleted file mode 100644
index daf315b..0000000
--- a/debian/ijsgimpprint.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/install/usr/bin/ijsgimpprint               usr/bin
-debian/install/usr/share/man/man1/ijsgimpprint.1  usr/share/man/man1
diff --git a/debian/ijsgutenprint.install b/debian/ijsgutenprint.install
new file mode 100644
index 0000000..46c6e2d
--- /dev/null
+++ b/debian/ijsgutenprint.install
@@ -0,0 +1,2 @@
+debian/install/usr/bin/ijsgutenprint.5.0           usr/bin
+debian/install/usr/share/man/man1/ijsgutenprint.1  usr/share/man/man1
diff --git a/debian/libgimpprint-dev.docs b/debian/libgimpprint-dev.docs
deleted file mode 100644
index 0b55f7f..0000000
--- a/debian/libgimpprint-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-doc/FAQ.html
diff --git a/debian/libgimpprint-dev.install b/debian/libgimpprint-dev.install
deleted file mode 100644
index a569389..0000000
--- a/debian/libgimpprint-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/install/usr/bin/gimpprint-config               usr/bin
-debian/install/usr/lib/libgimpprint.so                usr/lib
-debian/install/usr/lib/libgimpprint.la                usr/lib
-debian/install/usr/lib/libgimpprint.a                 usr/lib
-debian/install/usr/include/gimp-print                 usr/include
-debian/install/usr/share/aclocal/gimpprint.m4         usr/share/aclocal
-debian/install/usr/share/man/man3/gimpprint.3         usr/share/man/man3
-debian/install/usr/share/man/man1/gimpprint-config.1  usr/share/man/man1
diff --git a/debian/libgimpprint-doc.doc-base.in b/debian/libgimpprint-doc.doc-base.in
deleted file mode 100644
index 1dabe47..0000000
--- a/debian/libgimpprint-doc.doc-base.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Document: libgimpprint#LIBRARY_VERSION#-doc
-Title: The libgimpprint Reference Manual
-Author: The GIMP-Print Project
-Abstract: The gimpprint library routines give programmers an interface to
- print high quality bitmap images on most modern printers.  It includes drivers
- which provide printing quality for UNIX/Linux on a par with proprietary
- vendor-supplied drivers in many cases, and can be used for many of the most
- demanding printing tasks.  This manual covers developing programs that use
- libgimpprint for printing, as well as the programs that are distributed with
- GIMP-Print.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/libgimpprint#LIBRARY_VERSION#-doc/html/gimpprint_toc.html
-Files: /usr/share/doc/libgimpprint#LIBRARY_VERSION#-doc/html/*.html
diff --git a/debian/libgimpprint-doc.install.in b/debian/libgimpprint-doc.install.in
deleted file mode 100644
index 7ac38f5..0000000
--- a/debian/libgimpprint-doc.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/install/usr/share/gimp-print/doc/gimpprint.ps   usr/share/doc/libgimpprint#LIBRARY_VERSION#-doc
-debian/install/usr/share/gimp-print/doc/manual-html/*  usr/share/doc/libgimpprint#LIBRARY_VERSION#-doc/html
diff --git a/debian/libgimpprint.install b/debian/libgimpprint.install
deleted file mode 100644
index b9274fe..0000000
--- a/debian/libgimpprint.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/install/usr/lib/libgimpprint.so.*  usr/lib
-debian/install/usr/lib/libgimpprint-*     usr/lib
diff --git a/debian/gimp1.2-print.docs b/debian/libgutenprint-dev.docs
index 0b55f7f..0b55f7f 100644
--- a/debian/gimp1.2-print.docs
+++ b/debian/libgutenprint-dev.docs
diff --git a/debian/libgutenprint-dev.install b/debian/libgutenprint-dev.install
new file mode 100644
index 0000000..b680b22
--- /dev/null
+++ b/debian/libgutenprint-dev.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprint.so         usr/lib
+debian/install/usr/lib/pkgconfig/gutenprint.pc  usr/lib/pkgconfig
+debian/install/usr/include/gutenprint           usr/include
diff --git a/debian/libgutenprint-doc.doc-base.developer b/debian/libgutenprint-doc.doc-base.developer
new file mode 100644
index 0000000..e1a7e2a
--- /dev/null
+++ b/debian/libgutenprint-doc.doc-base.developer
@@ -0,0 +1,15 @@
+Document: libgutenprint-doc-developer
+Title: The libgutenprint Reference Manual
+Author: The Gutenprint Project
+Abstract: The gutenprint library routines give programmers an interface to
+ print high quality bitmap images on most modern printers.  It includes drivers
+ which provide printing quality for UNIX/Linux on a par with proprietary
+ vendor-supplied drivers in many cases, and can be used for many of the most
+ 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
+
+Format: HTML
+Index: /usr/share/doc/libgutenprint-doc/developer/html/index.html
+Files: /usr/share/doc/libgutenprint-doc/developer/html/*.html
diff --git a/debian/libgutenprint-doc.doc-base.reference b/debian/libgutenprint-doc.doc-base.reference
new file mode 100644
index 0000000..303c3ef
--- /dev/null
+++ b/debian/libgutenprint-doc.doc-base.reference
@@ -0,0 +1,14 @@
+Document: libgutenprint-doc-reference
+Title: The libgutenprint API Reference Manual
+Author: The Gutenprint Project
+Abstract: The gutenprint library routines give programmers an interface to
+ print high quality bitmap images on most modern printers.  It includes drivers
+ which provide printing quality for UNIX/Linux on a par with proprietary
+ 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
+
+Format: HTML
+Index: /usr/share/doc/libgutenprint-doc/reference/html/index.html
+Files: /usr/share/doc/libgutenprint-doc/reference/html/*.html
diff --git a/debian/libgutenprint-doc.install b/debian/libgutenprint-doc.install
new file mode 100644
index 0000000..2864212
--- /dev/null
+++ b/debian/libgutenprint-doc.install
@@ -0,0 +1,2 @@
+doc/developer/reference-html/*  usr/share/doc/libgutenprint-doc/developer/html
+doc/gutenprint/*                usr/share/doc/libgutenprint-doc/reference
diff --git a/debian/libgutenprint2.install.in b/debian/libgutenprint2.install.in
new file mode 100644
index 0000000..1a0d0f4
--- /dev/null
+++ b/debian/libgutenprint2.install.in
@@ -0,0 +1,3 @@
+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/libgutenprintui1-1.install b/debian/libgutenprintui1-1.install
new file mode 100644
index 0000000..ed8acb5
--- /dev/null
+++ b/debian/libgutenprintui1-1.install
@@ -0,0 +1 @@
+debian/install/usr/lib/libgutenprintui.so.*  usr/lib
diff --git a/debian/libgutenprintui1-dev.install b/debian/libgutenprintui1-dev.install
new file mode 100644
index 0000000..5823133
--- /dev/null
+++ b/debian/libgutenprintui1-dev.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprintui.so          usr/lib
+debian/install/usr/lib/pkgconfig/gutenprintui.pc   usr/lib/pkgconfig
+debian/install/usr/include/gutenprintui            usr/include
diff --git a/debian/libgutenprintui2-1.install b/debian/libgutenprintui2-1.install
new file mode 100644
index 0000000..42c6a6f
--- /dev/null
+++ b/debian/libgutenprintui2-1.install
@@ -0,0 +1 @@
+debian/install/usr/lib/libgutenprintui2.so.*  usr/lib
diff --git a/debian/libgutenprintui2-dev.install b/debian/libgutenprintui2-dev.install
new file mode 100644
index 0000000..3ea421f
--- /dev/null
+++ b/debian/libgutenprintui2-dev.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprintui2.so         usr/lib
+debian/install/usr/lib/pkgconfig/gutenprintui2.pc  usr/lib/pkgconfig
+debian/install/usr/include/gutenprintui2           usr/include
diff --git a/debian/rules b/debian/rules
index 113bdc9..6761aae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-# rules to package GIMP-Print
-# $Id: rules,v 1.29.2.11 2003/01/24 00:08:33 rleigh Exp $
+# rules to package gutenprint
+# $Id: rules,v 1.58 2005/06/26 17:06:59 rleigh Exp $
 #
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
@@ -10,15 +10,9 @@ export DH_OPTIONS
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_SYSTEM	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-
-ifneq (, $(filter $(DEB_BUILD_GNU_SYSTEM), kfreebsd-gnu knetbsd-gnu))
-DEB_BUILD_GNU_TYPE	= $(DEB_BUILD_GNU_CPU)-gnu
-DEB_HOST_GNU_TYPE	= $(DEB_HOST_GNU_CPU)-gnu
-endif
+DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -27,37 +21,42 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-# Get upstream version, and define libgimpprint suffix
-UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//")
+# Get upstream version, and define libgutenprint suffix
+#UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//")
+UPSTREAM_VERSION = 5.0.0-rc1
+UPSTREAM_VERSION_COMPACT = $(shell echo '$(UPSTREAM_VERSION)' | sed "s/\(.*\..*\)\..*/\1/"
 #LIBRARY_VERSION =  -$(UPSTREAM_VERSION)
-LIBRARY_VERSION = 1
+LIBRARY_VERSION = 2
+LIBRARYUI_VERSION = 1
+
+GENERATED_FILES = \
+	debian/libgutenprint2.install
 
 autoconfigure: autoconfigure-stamp
-autoconfigure-stamp: debian/control debian/libgimpprint-doc.doc-base debian/libgimpprint-doc.install
+autoconfigure-stamp: debian/control $(GENERATED_FILES)
 	dh_testdir
-
-	cd debian; \
-	for file in libgimpprint*; do \
-	  ln -sf $$file `echo $$file | sed -e 's/libgimpprint/libgimpprint$(LIBRARY_VERSION)/'`; \
-	done
-	rm debian/libgimpprint$(LIBRARY_VERSION)*.in
 	mkdir debian/build; \
 	cd debian/build; \
-	../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-static --enable-shared --without-gimp --with-cups --with-ijs --with-foomatic --with-foomatic3 --disable-test --without-translated-ppds --disable-cups-level3-ps
-	# Create cups-genppdupdate manual page
-	cd debian/build; \
-	CONFIG_HEADERS= CONFIG_FILES=debian/cups-genppdupdate.8 ./config.status; \
-	mv debian/cups-genppdupdate.8 ..; \
-	rmdir debian
-
+	../../configure --host=$(DEB_HOST_GNU_TYPE) \
+	  --build=$(DEB_BUILD_GNU_TYPE) \
+	  --prefix=/usr --mandir=\$${prefix}/share/man \
+	  --disable-static --enable-shared --disable-rpath \
+	  --with-modules=dlopen \
+	  --enable-libgutenprintui --enable-libgutenprintui2 \
+	  --without-gimp --with-gimp2 --with-cups --with-ijs \
+	  --with-foomatic --with-foomatic3 \
+	  --disable-test \
+	  --enable-cups-level3-ppds --disable-translated-ppds \
+	  --disable-cups-level3-ps --disable-static-genppd
 	touch autoconfigure-stamp
 
+
 build: build-stamp debian/control
 build-stamp: autoconfigure-stamp
 	dh_testdir
 
 	cd debian/build; \
-	$(MAKE);
+	$(MAKE)
 
 	touch build-stamp
 
@@ -72,13 +71,10 @@ clean: debian/control
 	  cp -f /usr/share/misc/config.guess scripts/config.guess
 
 	rm -rf debian/build debian/install
-	rm -rf debian/libgimpprint-doc.doc-base debian/libgimpprint-doc.install
-	rm -rf debian/libgimpprint$(LIBRARY_VERSION).files
-	rm -rf debian/libgimpprint$(LIBRARY_VERSION).postinst
-	rm -f  debian/cups-genppdupdate.8
 	-$(MAKE) distclean
 
-	rm -rf $(CURDIR)/debian/libgimpprint$(LIBRARY_VERSION)*
+	rm -f $(GENERATED_FILES)
+
 	dh_clean
 
 install: DH_OPTIONS=
@@ -95,21 +91,11 @@ install: build debian/control
 
 
 # Build architecture-independent files here.
-binary-indep: build install ChangeLog
+binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-#	dh_installdebconf -i
 	dh_installdocs -i
-	  cd debian/libgimpprint$(LIBRARY_VERSION)-doc/usr/share/doc/libgimpprint$(LIBRARY_VERSION)-doc/html; \
-	  if test ! -f gimpprint.html; then \
-	    ln -s gimpprint_toc.html gimpprint.html; \
-	  fi
-	  cd debian/gimpprint-doc/usr/share/doc/gimpprint-doc/html; \
-	  if test ! -f index.html; then \
-	    ln -s book1.html index.html; \
-	  fi
 	dh_installexamples -i
-	dh_installinfo -plibgimpprint$(LIBRARY_VERSION)-doc debian/install/usr/share/info/*
 	dh_installchangelogs -i NEWS
 	dh_link -i
 	dh_compress -i
@@ -120,67 +106,41 @@ binary-indep: build install ChangeLog
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: build install ChangeLog
+binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
-	  cp src/cups/README debian/cupsys-driver-gimpprint/usr/share/doc/cupsys-driver-gimpprint/README.cups
+	  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
+	  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 debian/ijsgutenprint/usr/bin/ijsgutenprint.5.0 debian/ijsgutenprint/usr/bin/ijsgutenprint
 	dh_installexamples -a
 	dh_installchangelogs -a NEWS
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -V
+# 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
+	dh_makeshlibs -a -V -X usr/lib/gutenprint
 	dh_installdeb -a
-	dh_shlibdeps -a -l`pwd`/debian/libgimpprint$(LIBRARY_VERSION)/usr/lib
+	dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui1-$(LIBRARYUI_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
 
-# Make sure ChangeLog is up-to-date.
-ChangeLog: changelog-stamp
-changelog-stamp: build
-	$(MAKE) ChangeLog
-
-SEDPATTERN = -e "s/\#UPSTREAM_VERSION\#/$(UPSTREAM_VERSION)/g" -e "s/\#LIBRARY_VERSION\#/$(LIBRARY_VERSION)/g"
-
-# Make sure debian/control is up-to-date.
-debian/control: debian/changelog debian/control.in
-	sed $(SEDPATTERN) <debian/control.in >debian/control
-
-# Make sure debian/libgimpprint-doc.doc-base is up-to-date.
-debian/libgimpprint-doc.doc-base: debian/changelog debian/libgimpprint-doc.doc-base.in
-	sed $(SEDPATTERN) <debian/libgimpprint-doc.doc-base.in >debian/libgimpprint-doc.doc-base
-
-# Make sure debian/libgimpprint-doc.install is up-to-date.
-debian/libgimpprint-doc.install: debian/changelog debian/libgimpprint-doc.install.in
-	sed $(SEDPATTERN) <debian/libgimpprint-doc.install.in >debian/libgimpprint-doc.install
-
-
-# Make sure that configure is up-to-date.
-configure: configure.in scripts/install-sh
-	if test -f configure.in; then \
-	  if test -f autogen.sh; then \
-	    export NOCONFIGURE=TRUE; \
-	    /bin/sh autogen.sh; \
-	  fi \
-	fi
-
-configure.in: configure.in.in
-	if test -f configure.in.in; then \
-	  if test -f autogen.sh; then \
-	    NOCONFIGURE=TRUE /bin/sh autogen.sh; \
-	  fi \
-	fi
+SEDPATTERN = -e "s/\#UPSTREAM_VERSION\#/$(UPSTREAM_VERSION)/g" -e "s/\#LIBRARY_VERSION\#/$(LIBRARY_VERSION)/g" -e "s/\#LIBRARYUI_VERSION\#/$(LIBRARYUI_VERSION)/g"
 
-scripts/install-sh:
-	if test -f autogen.sh; then \
-	  NOCONFIGURE=TRUE /bin/sh autogen.sh; \
-	fi
+debian/control: debian/control.in debian/changelog debian/rules
+	sed $(SEDPATTERN) <$< >$@
 
-configure.in.in:
+debian/libgutenprint2.install: debian/libgutenprint2.install.in debian/changelog
+	sed $(SEDPATTERN) <$< >$@
 
-.PHONY: build clean binary-indep binary-arch binary install autoconfigure NEWS
+.PHONY: build clean binary-indep binary-arch binary install autoconfigure