Imported Debian patch 5.0.0-1

16 files changed, 521 insertions, 645 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index cc24b31..17db71f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,13 +1,12 @@
 Gutenprint for Debian
 ---------------------
 
-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.
+This is Gutenprint version 5.0.  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'.
@@ -20,4 +19,4 @@ Gutenprint was previously known as Gimp-Print.  The name was changed
 for the 5.0 release.
 
 
- -- Roger Leigh <rleigh@debian.org>,  Tue, 02 Aug 2005 19:30:56 +0100
+ -- Roger Leigh <rleigh@debian.org>, Sun, 30 Jul 2006 20:47:46 +0100
diff --git a/debian/README.building b/debian/README.building
index c0cad80..dda6e7d 100644
--- a/debian/README.building
+++ b/debian/README.building
@@ -75,4 +75,4 @@ but will no longer build on Debian 3.0 (woody) and earlier distributions.
 
 I hope you like it!
 
-Roger Leigh <rleigh@debian.org> -- Sun, 14 Aug 2005 13:11:35 +0100
+ -- Roger Leigh <rleigh@debian.org>, Sun, 30 Jul 2006 20:47:46 +0100
diff --git a/debian/changelog b/debian/changelog
index 2ebb669..7f7d3a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+gutenprint (5.0.0-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * debian/compat: Switch to debhelper compatibility level 5.
+  * debian/control.in:
+    - Replace "beta" with "stable" in package descriptions.
+    - Add gutenprint-doc package now that GFDL licensed material with no
+      invariant sections is allowed in main.
+    - Build-Depend on debhelper >= 5.0.0.
+  * debian/copyright: Include full GFDL text.
+  * debian/rules:
+    - Update upstream version; compute from changelog revision number.
+    - Don't compress .pdf and .odt files.
+  * debian/gutenprint-doc.doc-base.in: Use new PDF manual rather than old
+    (removed) HTML user's guide.
+  * debian/gutenprint-doc.install: Install new PDF manual (and ODT source)
+    instead of old (removed) HTML user's guide.
+  * debian/patches: Drop patches applied upstream:
+    - 05_genppdconfig_remove_perlmenu.dpatch
+    - 06_genppdupdate_egrep_stdin_freeze.dpatch
+    - 07_print_ps_imageable_area_rounding.dpatch
+    - 08_escputil_raw_device_open.dpatch
+  * configure.ac: Teach PACKAGE_DATA_DIR about $datarootdir.
+  * doc/Makefile.am: install-data-local: Install files from $(srcdir), to
+    fix VPATH build. 
+
+ -- Roger Leigh <rleigh@debian.org>  Sat, 12 Aug 2006 18:31:14 +0100
+
 gutenprint (4.3.99+cvs20060521-4) unstable; urgency=low
 
   * src/escputil/escputil.c: When a raw device cannot be opened, display
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index c93277a..5309922 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
 Uploaders: Roger Leigh <rleigh@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
 
 Package: gimp-print
 Architecture: any
@@ -14,7 +14,7 @@ Enhances: gimp
 Description: print plugin for the GIMP
  This package includes the Print plugin for the GIMP.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -50,7 +50,7 @@ Description: printer drivers for CUPS
  .
    http://www.cups.org
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -72,7 +72,7 @@ Description: development files for the Gutenprint printer driver library
  Install this package if you wish to develop programs that use
  libgutenprint.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -94,7 +94,7 @@ Description: documentation for the Gutenprint printer driver library
  Install this package if you want to have lots of info about the
  Gutenprint library when you're programming.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -113,7 +113,7 @@ Description: runtime for the Gutenprint printer driver library
  This package includes the Gutenprint shared library, needed to
  run programs using Gutenprint drivers.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -138,7 +138,7 @@ Description: development files for the Gutenprint printer driver user interface
  libgutenprintui.  This package is intended for use only by cinepaint
  and gimp-1.2.
  .
- This is Gutenprint version 5.0.0-rc3, a beta
+ This is Gutenprint version 5.0.0, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -158,7 +158,7 @@ Description: runtime for the Gutenprint printer driver user interface library
  contains GTK+ widgets which may be used for print dialogs etc. for
  use with libgutenprint.
  .
- This is Gutenprint version 5.0.0-rc3, a beta
+ This is Gutenprint version 5.0.0, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -182,7 +182,7 @@ Description: development files for the Gutenprint printer driver user interface
  Install this package if you wish to develop packages that use
  libgutenprintui.
  .
- This is Gutenprint version 5.0.0-rc3, a beta
+ This is Gutenprint version 5.0.0, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -202,7 +202,7 @@ Description: runtime for the Gutenprint printer driver user interface library
  gimp-print.  libgutenprintui contains GTK+ widgets which may be
  used for print dialogs etc. for use with libgutenprint.
  .
- This is Gutenprint version 5.0.0-rc3, a beta
+ This is Gutenprint version 5.0.0, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -223,7 +223,7 @@ Description: locale data files for Gutenprint
  They are needed when you want the programs in Gutenprint to print
  their messages in other languages than US English.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -242,7 +242,7 @@ Description: maintenance utility for Epson Stylus printers
  escputil is a utility to clean and align the heads of Epson Stylus
  printers.  It can also check the current ink levels in the printer.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
   .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -280,7 +280,7 @@ Description: inkjet server - Ghostscript driver for Gutenprint
  this package will still work with the appropriate foomatic setup
  if you wish to make use of foomatic.
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -316,7 +316,27 @@ Description: linuxprinting.org printer support - database for Gutenprint printer
  .
  Home Page: http://www.linuxprinting.org/
  .
- This is Gutenprint version 5.0.0-rc3, a beta release
+ This is Gutenprint version 5.0.0, a stable 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.  Gutenprint was formerly known as Gimp-Print.
+
+Package: gutenprint-doc
+Architecture: all
+Section: doc
+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
+ Gutenprint library for photographic quality printing.  Currently
+ this covers using the Print plugin for the GIMP and the Common Unix
+ Printing System (CUPS).
+ .
+ This is Gutenprint version 5.0.0, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
diff --git a/debian/control.gfdl b/debian/control.gfdl
deleted file mode 100644
index cd1e1c4..0000000
--- a/debian/control.gfdl
+++ /dev/null
@@ -1,23 +0,0 @@
-Package: gutenprint-doc
-Architecture: all
-Section: doc
-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
- 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 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.  Gutenprint was formerly known as Gimp-Print.
-
diff --git a/debian/control.in b/debian/control.in
index 34f6344..bd1f6fd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
 Uploaders: Roger Leigh <rleigh@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
 
 Package: gimp-print
 Architecture: any
@@ -14,7 +14,7 @@ Enhances: gimp
 Description: print plugin for the GIMP
  This package includes the Print plugin for the GIMP.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -50,7 +50,7 @@ Description: printer drivers for CUPS
  .
    http://www.cups.org
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -72,7 +72,7 @@ Description: development files for the Gutenprint printer driver library
  Install this package if you wish to develop programs that use
  libgutenprint.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -94,7 +94,7 @@ Description: documentation for the Gutenprint printer driver library
  Install this package if you want to have lots of info about the
  Gutenprint library when you're programming.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -113,7 +113,7 @@ Description: runtime for the Gutenprint printer driver library
  This package includes the Gutenprint shared library, needed to
  run programs using Gutenprint drivers.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -138,7 +138,7 @@ Description: development files for the Gutenprint printer driver user interface
  libgutenprintui.  This package is intended for use only by cinepaint
  and gimp-1.2.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -158,7 +158,7 @@ Description: runtime for the Gutenprint printer driver user interface library
  contains GTK+ widgets which may be used for print dialogs etc. for
  use with libgutenprint.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -182,7 +182,7 @@ Description: development files for the Gutenprint printer driver user interface
  Install this package if you wish to develop packages that use
  libgutenprintui.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -202,7 +202,7 @@ Description: runtime for the Gutenprint printer driver user interface library
  gimp-print.  libgutenprintui contains GTK+ widgets which may be
  used for print dialogs etc. for use with libgutenprint.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable
  development release in the 5.0 line.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -223,7 +223,7 @@ Description: locale data files for Gutenprint
  They are needed when you want the programs in Gutenprint to print
  their messages in other languages than US English.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -242,7 +242,7 @@ Description: maintenance utility for Epson Stylus printers
  escputil is a utility to clean and align the heads of Epson Stylus
  printers.  It can also check the current ink levels in the printer.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
   .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -280,7 +280,7 @@ Description: inkjet server - Ghostscript driver for Gutenprint
  this package will still work with the appropriate foomatic setup
  if you wish to make use of foomatic.
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
@@ -316,7 +316,27 @@ Description: linuxprinting.org printer support - database for Gutenprint printer
  .
  Home Page: http://www.linuxprinting.org/
  .
- This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable 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.  Gutenprint was formerly known as Gimp-Print.
+
+Package: gutenprint-doc
+Architecture: all
+Section: doc
+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
+ Gutenprint library for photographic quality printing.  Currently
+ this covers using the Print plugin for the GIMP and the Common Unix
+ Printing System (CUPS).
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a stable release
  in the 5.0 series.
  .
  Gutenprint is the print facility for the GIMP, and in addition a
diff --git a/debian/copyright b/debian/copyright
index 7aae0fb..6095271 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,9 +25,407 @@ 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.
 
-Additionally, this release of Gutenprint has restored the GFDL-licensed
-User's Guide, but this is due to be dropped upstream and is no longer
-packaged.
+The user manual, in the gutenprint-doc package, is licensed under the
+terms of the GNU Free Documentation License:
 
 
- -- Roger Leigh <rleigh@debian.org>  Sun, 21 May 2006 12:38:27 +0100
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+
+ -- Roger Leigh <rleigh@debian.org>  Sat, 12 Aug 2006 18:15:27 +0100
diff --git a/debian/gutenprint-doc.doc-base b/debian/gutenprint-doc.doc-base
index b7a0cd2..ab5b3f0 100644
--- a/debian/gutenprint-doc.doc-base
+++ b/debian/gutenprint-doc.doc-base
@@ -1,14 +1,11 @@
 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).
+Title: Gutenprint 5.0 User's Manual
+Author: Robert Krawitz
+Abstract: Gutenprint is a set of printer drivers written to take
+ advantage of the full capabilities of a wide range of printers. This
+ document explaina how to configure and use the Gutenprint software to
+ achieve high quality printouts.
 Section: Apps/Graphics
 
-Format: HTML
-Index: /usr/share/doc/gutenprint-doc/html/index.html
-Files: /usr/share/doc/gutenprint-doc/html/*
+Format: PDF
+Files: /usr/share/doc/gutenprint-doc/gutenprint-users-manual.pdf
diff --git a/debian/gutenprint-doc.install b/debian/gutenprint-doc.install
index d481933..e76155a 100644
--- a/debian/gutenprint-doc.install
+++ b/debian/gutenprint-doc.install
@@ -1,2 +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
+debian/install/usr/share/gutenprint/doc/gutenprint-users-manual.pdf  usr/share/doc/gutenprint-doc
+debian/install/usr/share/gutenprint/doc/gutenprint-users-manual.odt  usr/share/doc/gutenprint-doc
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ec1a395..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-05_genppdconfig_remove_perlmenu.dpatch
-06_genppdupdate_egrep_stdin_freeze.dpatch
-07_print_ps_imageable_area_rounding.dpatch
-08_escputil_raw_device_open.dpatch
diff --git a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch b/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
deleted file mode 100644
index afbd9d2..0000000
--- a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
+++ /dev/null
@@ -1,257 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_genppdconfig_remove_perlmenu.dpatch by  <rleigh@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove perlmenu support from cups-genppdconfig.in
-
-@DPATCH@
-
-diff -urN gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in
---- gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in	2005-09-03 19:46:25.240866064 +0100
-+++ gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in	2005-09-02 22:52:31.936066848 +0100
-@@ -36,12 +36,8 @@
- sub create_dir($);
- sub dialog_read($$);
- sub dialog_read_list (\%\@$$);
--sub perl_menu ($$$$@);
--sub perl_menu_read_list (\%\@$$);
--sub perl_menu_mult ($$@);
- 
- my $DIALOG = "@DIALOG@";                        # version of dialog to call
--my $use_dialog = 0;                             # whether to use dialog
- my $BACKTITLE = "Gutenprint CUPS PPD creation"; # dialog screen title
- my %printers;                                   # master list of printers
- my %languages;                                  # master list of languages
-@@ -74,16 +70,6 @@
-     exit 0;
- }
- 
--# Can we use dialog?
--if (-x $DIALOG) {
--    $use_dialog = 1;
--} else {
--    BEGIN { $Curses::OldCurses = 1; }
--    use Curses;
--    use perlmenu;
--    perl_menu_defaults();
--}
--
- while (my $option = main_menu()) { # Display main menu and run selection
-     if ($option eq "Help") {
- 	display_help();
-@@ -218,21 +204,14 @@
- 	[ "Create", "Create PPDs" ],
- 	[ "Exit", "Exit the program" ]
-     );
--    if ($use_dialog) {
--	my $dialog_options;
--	for my $i ( 0 .. $#menu_options) {
--	    for my $j ( 0 .. $#{$menu_options[$i]}) {
--		$dialog_options .= "\"$menu_options[$i][$j]\" ";
--	    }
--	}
--	while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) {
--	    chomp ($option);
--	    return $option;
-+    my $dialog_options;
-+    for my $i ( 0 .. $#menu_options) {
-+	for my $j ( 0 .. $#{$menu_options[$i]}) {
-+	    $dialog_options .= "\"$menu_options[$i][$j]\" ";
- 	}
--    } else {
--	$option = perl_menu(1, "Main menu", "Choose an option.",
--			    "Current PPD directory: $chosen_location",
--			    @menu_options);
-+    }
-+    while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) {
-+	chomp ($option);
- 	return $option;
-     }
- }
-@@ -310,19 +289,7 @@
-     or die "can't open temporary help file";
-     print $HELPFILE "$help_text";
-     $HELPFILE->flush();
--    if ($use_dialog) {
--        dialog_read("Help", "--textbox $helpfilename 18 76");
--    } else {
--        &menu_init(0, "Help", 0);
--        open(TEMP,$helpfilename);
--        while (<TEMP>) {
--            s/^(\t+)/'        ' x length($1)/e;
--            &expand($_) if /\t/;
--            &menu_item($_,"", -1);
--        }
--       close(TEMP);
--       &menu_display("Help viewer: (RET/u/t) exit  (n/p) next/previous page (b) beginning (e) end");
--    }
-+    dialog_read("Help", "--textbox $helpfilename 18 76");
-     unlink0($HELPFILE, $helpfilename) or die "Error unlinking help file $helpfilename safely: $!";
-     close($HELPFILE) or die "can't close help file $helpfilename: $!";
-     return;
-@@ -336,12 +303,7 @@
- sub choose_printers {
-     my $title = "Printer selection";
-     my $options = "--checklist \"Choose the printer models you wish to use with CUPS.\" 18 54 11";
--    if ($use_dialog) {
--	dialog_read_list(%printers, @chosen_printers, $title, $options);
--    } else {
--	perl_menu_read_list(%printers, @chosen_printers, $title,
--			    "Choose the printer models you wish to use with CUPS.");
--    }
-+    dialog_read_list(%printers, @chosen_printers, $title, $options);
- }
- 
- 
-@@ -352,12 +314,7 @@
- sub choose_languages {
-     my $title = "Language selection";
-     my $options = "--checklist \"Choose the languages you wish to use with CUPS.\" 18 54 11";
--    if ($use_dialog) {
--	dialog_read_list(%languages, @chosen_languages, $title, $options);
--    } else {
--	perl_menu_read_list(%languages, @chosen_languages, $title,
--			    "Choose the languages you wish to use with CUPS.");
--    }
-+    dialog_read_list(%languages, @chosen_languages, $title, $options);
- }
- 
- 
-@@ -367,12 +324,8 @@
- #
- sub choose_location {
-     my $location;
--    if ($use_dialog) {
--	$location = dialog_read("Location selection",
--				"--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location");
--    } else {
--	$location = &menu_getstr(5,12,"Directory:", 1, $chosen_location);
--    }
-+    $location = dialog_read("Location selection",
-+			    "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location");
-     if (!defined($location)) {
- 	$location = "";
-     }
-@@ -432,7 +385,7 @@
-     } else {
- 	$printers = "";
-     }
--    if (! $silent && $use_dialog) {
-+    if (! $silent) {
- 	open DIALOG, "| $DIALOG --sleep 2 --backtitle \"$BACKTITLE\" --title \"Creating PPD files\" --guage \"Language: \nPPD files: \" 10 72 0"
- 	    or die "can't fork dialog: $!";
-     }
-@@ -449,7 +402,7 @@
- 	    if ($percent > 100) {
- 		$percent = 100;
- 	    }
--	    if (! $silent && $use_dialog) {
-+	    if (! $silent) {
- 		print DIALOG "$percent\n";
- 		print DIALOG "XXX\nLanguage: $language\nPPD files: $count/$total\n\n$file\nXXX\n";
- 		DIALOG->flush();
-@@ -460,7 +413,7 @@
- 	}
- 	close GENPPD or die "can't close cups-genppd pipe: $!";
-     }
--    if (! $silent && $use_dialog) {
-+    if (! $silent) {
- 	print DIALOG "100\nXXX\nLanguage: \nPPD files: $total/$total\n\nCompleted\nXXX\n";
- 	close DIALOG or die "can't close dialog pipe";
-     }
-@@ -521,95 +474,3 @@
- 	@$list=split(/ /, $tmplist);
-     }
- }
--
--
--# scalar
--# perl_menu($title)
--#
--sub perl_menu ($$$$@) {
--    my ($top, $title, $question, $subtitle, @items) = @_;
--    my $selection;
--    &menu_init(1, "cups-genppdconfig", $top, $title, "$BACKTITLE\n-<$subtitle");
--
--    for my $i ( 0 .. $#items) {
--	&menu_item($items[$i][1], $items[$i][0]);
--    }
--
--    $selection = &menu_display($question);
--    return $selection;
--}
--
--# scalar
--# perl_menu_mult($title, $question, @items)
--#
--sub perl_menu_mult ($$@) {
--    my ($title, $question, @items) = @_;
--    my $selection;
--    &menu_init(1, "cups-genppdconfig", 0, $title, $BACKTITLE);
--
--    for my $i ( 0 .. $#items) {
--	&menu_item($items[$i][1], $items[$i][0], $items[$i][2]);
--    }
--
--    perl_menu_sel_defaults();
--    $selection = &menu_display_mult($question);
--    perl_menu_defaults();
--    if ($selection eq "%UP%" or $selection eq "%NONE%") {
--	return undef;
--    }
--    return $selection;
--}
--
--
--#
--# perl_menu_read_list(%masterlist
--#                     @chosenlist
--#                     $title
--#                     $question
--#                     - Construct list dialog, entries from %masterlist,
--#                             defaults from @chosenlist.
--#
--sub perl_menu_read_list (\%\@$$) {
--    my $masterlist = $_[0];
--    my $list = $_[1];
--    my $title = $_[2];
--    my $question = $_[3];
--    my $tmplist;
--    my @menulist = ();
--    my $item;
--    my $selected;
--# Make a list for use with perlmenu.
--    foreach $item (sort keys %$masterlist) {
--	$selected = 0;
--	foreach (@$list) {
--	    if ($item eq $_) {
--		$selected = 1;
--		last;
--	    }
--	}
--	my $formatstring = sprintf "%-14s - %s", $item, $masterlist->{$item};
--	push @menulist, [ $item, $formatstring, $selected ] ;
--    }
--    $tmplist = perl_menu_mult("$title", "RET=toggle selection (u/t) exit  (n/p) next/previous page (b) beginning (e) end", @menulist);
--    if (defined($tmplist)) {
--	$tmplist =~ s/\"//g;
--	@$list=split(/,/, $tmplist);
--    }
--}
--
--
--#
--# perl_menu_defaults - set menu defaults
--#
--sub perl_menu_defaults {
--    &menu_prefs(1, 0, 1, 0, "y", 0, 0);
--}
--
--
--#
--# perl_menu_sel_defaults - set menu defaults for multiple selections
--#
--sub perl_menu_sel_defaults {
--    &menu_prefs(1, 0, 1, 0, "y", 1, 0);
--}
--
diff --git a/debian/patches/06_genppdupdate_egrep_stdin_freeze.dpatch b/debian/patches/06_genppdupdate_egrep_stdin_freeze.dpatch
deleted file mode 100644
index 21980de..0000000
--- a/debian/patches/06_genppdupdate_egrep_stdin_freeze.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_genppdupdate_egrep_stdin_freeze.dpatch.dpatch by  <rleigh@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: cups-genppdupdate should not freeze waiting on stdin when running egrep
-
-@DPATCH@
-
-diff -urN gutenprint-4.3.99+cvs20060521.original/src/cups/cups-genppdupdate.in gutenprint-4.3.99+cvs20060521/src/cups/cups-genppdupdate.in
---- gutenprint-4.3.99+cvs20060521.original/src/cups/cups-genppdupdate.in	2006-03-29 03:27:15.000000000 +0100
-+++ gutenprint-4.3.99+cvs20060521/src/cups/cups-genppdupdate.in	2006-05-22 17:37:57.224645208 +0100
-@@ -131,13 +131,15 @@
- 	chomp;
- 	push @ppd_files,  $_;
-     }
--    open PPDFILES, '-|', 'egrep', '-i', '-L', 'Foomatic', @ppd_files or die "can't grep $ppdlist: $!";
--    @ppd_files = ();
--    while (<PPDFILES>) {
--	chomp;
--	push @ppd_files,  $_;
-+    if (@ppd_files) {
-+	open PPDFILES, '-|', 'egrep', '-i', '-L', 'Foomatic', @ppd_files or die "can't grep $ppdlist: $!";
-+	@ppd_files = ();
-+	while (<PPDFILES>) {
-+	    chomp;
-+	    push @ppd_files,  $_;
-+	}
-+	close PPDFILES or ($! == 0) or die "can't close grep pipe: $!";
-     }
--    close PPDFILES or ($! == 0) or die "can't close grep pipe: $!";
- }
- 
- 
diff --git a/debian/patches/07_print_ps_imageable_area_rounding.dpatch b/debian/patches/07_print_ps_imageable_area_rounding.dpatch
deleted file mode 100644
index c7bfc0e..0000000
--- a/debian/patches/07_print_ps_imageable_area_rounding.dpatch
+++ /dev/null
@@ -1,174 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 7_print_ps_imageable_area_rounding.dpatch by  <rleigh@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Round ImageableArea towards the centre of the page
-
-@DPATCH@
-
-diff -urN gutenprint-4.3.99+cvs20060521.original/src/main/print-ps.c gutenprint-4.3.99+cvs20060521/src/main/print-ps.c
---- gutenprint-4.3.99+cvs20060521.original/src/main/print-ps.c	2006-04-17 03:08:21.000000000 +0100
-+++ gutenprint-4.3.99+cvs20060521/src/main/print-ps.c	2006-06-05 10:42:01.194455852 +0100
-@@ -1,5 +1,5 @@
- /*
-- * "$Id: print-ps.c,v 1.84 2006/04/17 02:06:19 rlk Exp $"
-+ * "$Id: print-ps.c,v 1.87 2006/06/04 18:06:34 rleigh Exp $"
-  *
-  *   Print plug-in Adobe PostScript driver for the GIMP.
-  *
-@@ -34,6 +34,7 @@
- #include "gutenprint-internal.h"
- #include <time.h>
- #include <string.h>
-+#include <math.h>
- #ifdef HAVE_LIMITS_H
- #include <limits.h>
- #endif
-@@ -159,6 +160,8 @@
- 	stp_fill_parameter_settings(description, &(the_parameters[i]));
- 	break;
-       }
-+  if (strcmp(name, "PPDFile") == 0)
-+    return;
- 
-   if (strcmp(name, "PrintingMode") == 0)
-     {
-@@ -183,7 +186,7 @@
- 	      const stp_papersize_t *pt = stp_get_papersize_by_index(i);
- 	      if (strlen(pt->name) > 0)
- 		stp_string_list_add_string
--		  (description->bounds.str, pt->name, pt->text);
-+		  (description->bounds.str, pt->name, gettext(pt->text));
- 	    }
- 	  description->deflt.str =
- 	    stp_string_list_param(description->bounds.str, 0)->name;
-@@ -230,9 +233,9 @@
- ps_parameters(const stp_vars_t *v, const char *name,
- 	      stp_parameter_t *description)
- {
--  setlocale(LC_ALL, "C");
-+  char *locale = setlocale(LC_ALL, "C");
-   ps_parameters_internal(v, name, description);
--  setlocale(LC_ALL, "");
-+  setlocale(LC_ALL, locale);
- }
- 
- /*
-@@ -260,8 +263,8 @@
-       != NULL)
-     {
-       sscanf(dimensions, "%f%f", &fwidth, &fheight);
--      *width = fwidth;
--      *height = fheight;
-+      *width = (int) fwidth;
-+      *height = (int) fheight;
-       stp_dprintf(STP_DBG_PS, v, "dimensions '%s' %f %f %d %d\n",
- 		  dimensions, fwidth, fheight, *width, *height);
-     }
-@@ -272,9 +275,9 @@
- static void
- ps_media_size(const stp_vars_t *v, int *width, int *height)
- {
--  setlocale(LC_ALL, "C");
-+  char *locale = setlocale(LC_ALL, "C");
-   ps_media_size_internal(v, width, height);
--  setlocale(LC_ALL, "");
-+  setlocale(LC_ALL, locale);
- }
- 
- /*
-@@ -304,13 +307,16 @@
- 		       "ImageableArea", pagesize, NULL))
-       != NULL)
-     {
--      stp_dprintf(STP_DBG_PS, v, "area = \'%s\'\n", area);
--      if (sscanf(area, "%f%f%f%f", &fleft, &fbottom, &fright, &ftop) == 4)
-+      int status = sscanf(area, "%f%f%f%f", &fleft, &fbottom, &fright, &ftop);
-+      stp_dprintf(STP_DBG_PS, v,
-+		  "area = \'%s\' status = %d l %f r %f b %f t %f h %d w %d\n",
-+		  area, status, fleft, fright, fbottom, ftop, width, height);
-+      if (status)
- 	{
--	  *left   = (int)fleft;
--	  *right  = (int)fright;
--	  *bottom = height - (int)fbottom;
--	  *top    = height - (int)ftop;
-+	  *left   = (int) ceil((double) fleft);
-+	  *right  = (int) floor((double) fright);
-+	  *bottom = (int) floor((double) height - fbottom);
-+	  *top    = (int) ceil((double) height - ftop);
- 	  if (use_max_area)
- 	    {
- 	      if (*left > 0)
-@@ -344,9 +350,9 @@
-                   int  *bottom,		/* O - Bottom position in points */
-                   int  *top)		/* O - Top position in points */
- {
--  setlocale(LC_ALL, "C");
-+  char *locale = setlocale(LC_ALL, "C");
-   ps_imageable_area_internal(v, 0, left, right, bottom, top);
--  setlocale(LC_ALL, "");
-+  setlocale(LC_ALL, locale);
- }
- 
- static void
-@@ -356,9 +362,9 @@
- 			  int  *bottom,	/* O - Bottom position in points */
- 			  int  *top)	/* O - Top position in points */
- {
--  setlocale(LC_ALL, "C");
-+  char *locale = setlocale(LC_ALL, "C");
-   ps_imageable_area_internal(v, 1, left, right, bottom, top);
--  setlocale(LC_ALL, "");
-+  setlocale(LC_ALL, locale);
- }
- 
- static void
-@@ -391,9 +397,9 @@
- static void
- ps_describe_resolution(const stp_vars_t *v, int *x, int *y)
- {
--  setlocale(LC_ALL, "C");
-+  char *locale = setlocale(LC_ALL, "C");
-   ps_describe_resolution_internal(v, x, y);
--  setlocale(LC_ALL, "");
-+  setlocale(LC_ALL, locale);
- }
- 
- static const char *
-@@ -454,6 +460,7 @@
-   int           image_height,
- 		image_width;
-   stp_vars_t	*nv = stp_vars_create_copy(v);
-+  char		*locale;
-   if (!resolution)
-     resolution = "";
-   if (!media_size)
-@@ -638,11 +645,11 @@
-      always be printed with a decimal point rather than the
-      locale-specific setting. */
- 
--  setlocale(LC_ALL, "C");
-+  locale = setlocale(LC_ALL, "C");
-   stp_zprintf(v, "%.3f %.3f scale\n",
- 	      (double)out_width / ((double)image_width),
- 	      (double)out_height / ((double)image_height));
--  setlocale(LC_ALL, "");
-+  setlocale(LC_ALL, locale);
- 
-   stp_channel_reset(nv);
-   stp_channel_add(nv, 0, 0, 1.0);
-@@ -766,10 +773,9 @@
- static int
- ps_print(const stp_vars_t *v, stp_image_t *image)
- {
--  int status;
--  setlocale(LC_ALL, "C");
--  status = ps_print_internal(v, image);
--  setlocale(LC_ALL, "");
-+  char *locale = setlocale(LC_ALL, "C");
-+  int status = ps_print_internal(v, image);
-+  setlocale(LC_ALL, locale);
-   return status;
- }
- 
diff --git a/debian/patches/08_escputil_raw_device_open.dpatch b/debian/patches/08_escputil_raw_device_open.dpatch
deleted file mode 100644
index 0fceb9e..0000000
--- a/debian/patches/08_escputil_raw_device_open.dpatch
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_escputil_raw_device_open.dpatch by  <rleigh@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fail with an informative error if opening a raw device fails
-
-@DPATCH@
-
-diff -urN gutenprint-4.3.99+cvs20060521.original/src/escputil/escputil.c gutenprint-4.3.99+cvs20060521/src/escputil/escputil.c
---- gutenprint-4.3.99+cvs20060521.original/src/escputil/escputil.c	2006-04-16 02:01:10.000000000 +0100
-+++ gutenprint-4.3.99+cvs20060521/src/escputil/escputil.c	2006-06-06 20:08:53.675580025 +0100
-@@ -424,7 +424,7 @@
-   exit(0);
- }
- 
--void
-+static void
- print_debug_data(const char *buf, size_t count)
- {
-   int i;
-@@ -737,6 +737,28 @@
-   alarm_interrupt = 1;
- }
- 
-+static int
-+open_raw_device(void)
-+{
-+  int fd;
-+
-+  if (!raw_device)
-+   {
-+      fprintf(stderr, _("Please specify a raw device\n"));
-+      exit(1);
-+    }
-+
-+  fd = open(raw_device, O_RDWR, 0666);
-+  if (fd == -1)
-+    {
-+      fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
-+              strerror(errno));
-+      exit(1);
-+    }
-+
-+  return fd;
-+}
-+
- static const stp_printer_t *
- initialize_printer(int quiet, int fail_if_not_found)
- {
-@@ -757,13 +779,7 @@
- 
-   quiet = 0;
- 
--  fd = open(raw_device, O_RDWR, 0666);
--  if (fd == -1)
--    {
--      fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
--              strerror(errno));
--      exit(1);
--    }
-+  fd = open_raw_device();
- 
-   if (!printer_model)
-     {
-@@ -1349,13 +1365,7 @@
- 		      printer_model,
- 		      printer ? "" : "(Unknown model)"));
- 
--  fd = open(raw_device, O_RDWR, 0666);
--  if (fd == -1)
--    {
--      fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
--              strerror(errno));
--      exit(1);
--    }
-+  fd = open_raw_device();
- 
-   if (isnew)
-     {
-@@ -1463,13 +1473,7 @@
- 	    "Warning! Printer %s is not known; information may be incomplete or incorrect\n",
- 	    printer_model);
- 
--  fd = open(raw_device, O_RDWR, 0666);
--  if (fd == -1)
--    {
--      fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
--              strerror(errno));
--      exit(1);
--    }
-+  fd = open_raw_device();
- 
-   if (isnew)
-     {
diff --git a/debian/rules b/debian/rules
index 1489f1b..fb03318 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 # rules to package gutenprint
-# $Id: rules,v 1.58 2005/06/26 17:06:59 rleigh Exp $
 #
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -25,8 +24,8 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 # Get upstream version, and define libgutenprint suffix
-#UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//")
-UPSTREAM_VERSION = 5.0.0-rc3
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//")
+#UPSTREAM_VERSION = 5.0.0
 UPSTREAM_VERSION_COMPACT = $(shell echo '$(UPSTREAM_VERSION)' | sed "s/\(.*\..*\)\..*/\1/"
 #LIBRARY_VERSION =  -$(UPSTREAM_VERSION)
 LIBRARY_VERSION = 2
@@ -103,7 +102,7 @@ binary-indep: build install
 	dh_installexamples -i
 	dh_installchangelogs -i NEWS
 	dh_link -i
-	dh_compress -i
+	dh_compress -i -X.pdf -X.odt
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
@@ -126,7 +125,7 @@ binary-arch: build install
 	dh_installchangelogs -a NEWS
 	dh_strip -a
 	dh_link -a
-	dh_compress -a
+	dh_compress -a -X.pdf -X.odt
 	dh_fixperms -a
 # Strip DT_RPATH from CUPS binaries.
 	find debian/cupsys-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete