--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-doc.links
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libgnomeprint2.2-doc/html usr/share/gtk-doc/html/libgnomeprint
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-data.install
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-data.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/libgnomeprint
+debian/tmp/usr/share/locale
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-doc.doc-base
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libgnomeprint2.2-doc
+Title: GNOME 2 Print Reference Manual
+Author: gtk-doc-tools
+Abstract: This manual documents the interfaces of the GNOME Print library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libgnomeprint2.2-doc/html/index.html
+Files: /usr/share/doc/libgnomeprint2.2-doc/html/*.html
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-doc.install
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/gtk-doc/html/libgnomeprint/* usr/share/doc/libgnomeprint2.2-doc/html/
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-dev.files
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-dev.files
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/pkgconfig
+usr/lib/libgnomeprint-2-2.{a,la,so}
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-data.files
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-data.files
@@ -0,0 +1,2 @@
+usr/share/locale
+usr/share/libgnomeprint
--- libgnomeprint-2.18.7.orig/debian/changelog
+++ libgnomeprint-2.18.7/debian/changelog
@@ -0,0 +1,689 @@
+libgnomeprint (2.18.7-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Add libglib2.0-doc and libpango1.0-doc to b-d-i to ensure proper 
+    xrefs.
+  * Stop mentioning GNOME 2.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release.
+  * debian/control.in:
+    + Update Standards-Version to 3.8.4.
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 14 Apr 2010 07:21:25 +0200
+
+libgnomeprint (2.18.6-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 06 Mar 2009 19:00:13 +0100
+
+libgnomeprint (2.18.5-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Make the team own maintainership. Closes: #499512.
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release, with just updated translations.
+  * Updates Standards-Version to 3.8.0, no changes needed.
+  * Add Build-dep on intltool as configure requires it.
+  * debian/libgnomeprint2.2-doc.doc-base:
+    - s/Gnome/GNOME/.
+    - Fix section.
+
+  [ Loic Minier ]
+  * Drop libxml-parser-perl bdep as we bdep on intltool now.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com>  Wed, 24 Sep 2008 23:14:20 +0200
+
+libgnomeprint (2.18.4-2) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * Build-depend on libcups2-dev instead of libcupsys2-dev and recommend
+    cups instead of cupsys, as cups is transitioning to that new name.
+    Closes: #490690.
+
+  [ Josselin Mouette ]
+  * Only suggest cups, to avoid having it installed as the result of 
+    installing any package depending on libgnomeprint.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 18 Sep 2008 16:41:32 +0200
+
+libgnomeprint (2.18.4-1) unstable; urgency=low
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release.
+    + Fixes embedding of RGBA images (Closes: #457937).
+
+  [ Loic Minier ]
+  * Add ${shlibs:Depends} to libgnomeprint2.2-dev.
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 13 Feb 2008 09:04:46 +0100
+
+libgnomeprint (2.18.3-1) unstable; urgency=low
+
+  [ Kilian Krause ]
+  * Use binary:version and source:Version for binnNMU-safe uploads as
+    added in dpkg-dev 1.13.19. Add to Build-Depends accordingly.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/control.in:
+      - Remove libpopt-dev from Build-Depends.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3, no additional changes needed.
+
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 31 Jan 2008 09:24:47 +0100
+
+libgnomeprint (2.18.2-1) unstable; urgency=low
+
+  * New upstream release, with no API/ABI changes.
+  * debian/control.in:
+    + Use ${binary:Version} instead of ${Source-Version} to make lintian happy.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 22 Sep 2007 12:07:57 +0200
+
+libgnomeprint (2.18.1-1) unstable; urgency=low
+
+  * New upstream release; no API change.
+    - Addresses GNOME bugs #461526, #409738, #418595 and #409743.
+
+ -- Alan Baghumian <alan@technotux.org>  Thu, 09 Aug 2007 09:11:06 +0330
+
+libgnomeprint (2.18.0-2) unstable; urgency=low
+
+  * Upload to unstable; drop check-dist include.
+  * Wrap build-deps and deps.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 12 Apr 2007 18:41:45 +0200
+
+libgnomeprint (2.18.0-1) experimental; urgency=low
+
+  * Update watch file.
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * Merge 2.12.1-7 and 2.12.1-8; SVN r8088:9053.
+    - Drop patch 13_fix-boxed-tab-char, merged upstream.
+  * Don't export LDFLAGS; build-depends on cdbs >= 0.4.41.
+  * Build-depend on libxml-parser-perl instead of intltool.
+  * New upstream major stable release; no API change.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 18 Mar 2007 13:07:47 +0100
+
+libgnomeprint (2.17.0-1) experimental; urgency=low
+
+  * New upstream development release; with API additions.
+    - Target at experimental.
+    - Bump up shlibs to >= 2.17.0.
+    - Drop patch 10_filters-missing-libs, link was fixed upstream.
+    - Drop patch 11_check-for-libm-in-configure, merged upstream.
+    - Drop patch 70_mandatory-relibtoolize, not required anymore.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 15 Nov 2006 15:36:12 +0100
+
+libgnomeprint (2.12.1-8) unstable; urgency=low
+
+  * Add a get-orig-source target to retrieve the upstream tarball.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 13 Jan 2007 23:33:00 +0100
+
+libgnomeprint (2.12.1-7) unstable; urgency=low
+
+  * New patch, 12_cups-transport, to fix handling of settings made in the
+    printing options dialog; patch by Pascal De Vuyst; taken from the Ubuntu
+    package; see also Launchpad #34112.
+  * New patch, 13_fix-boxed-tab-char, to fix the boxed tab character;
+    derived from a patch in GNOME #330907; Launchpad #39698; taken from the
+    Ubuntu package.
+
+ -- Loic Minier <lool@dooz.org>  Fri,  8 Dec 2006 11:17:45 +0100
+
+libgnomeprint (2.12.1-6) unstable; urgency=high
+
+  * Rename filters_missing_libs patch to 10_filters-missing-libs and only
+    patch Makefile.am in this patch.
+  * New patch, 11_check-for-libm-in-configure, to check for libm in configure
+    and link with -lm. (Closes: #379428, #379429)
+  * New patch, mandatory-relibtoolize, which is necessary to regenerated the
+    autotools files changed by other patches.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 29 Jul 2006 18:00:50 +0200
+
+libgnomeprint (2.12.1-5) unstable; urgency=low
+
+  * Drop *.la files from libgnomeprint2.2-dev as these were dropped from all
+    useful packages depending on it.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 22 Jun 2006 14:31:46 +0200
+
+libgnomeprint (2.12.1-4) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Make the package binNMU-safe.
+    + Build-depend on dpkg-dev 1.13.19.
+    + Use ${source:Version}.
+
+  [ Loic Minier ]
+  * Rebuild against a libgnomecups with fixed shlibs. (Closes: #357947)
+  * Bump up Standards-Version to 3.7.2.
+    [debian/control, debian/control.in]
+  * Add ${misc:Depends}.
+    [debian/control, debian/control.in]
+  * Bump up Debhelper compatibility level to 5.
+    [debian/compat, debian/control, debian/control.in]
+  * Let libgnomeprint2.2-dev Suggest libgnomeprint2.2-doc.
+    [debian/control, debian/control.in]
+  * Cleanup install files from empty lines.
+    [debian/libgnomeprint2.2-dev.install, debian/libgnomeprint2.2-doc.install]
+
+ -- Loic Minier <lool@dooz.org>  Mon,  5 Jun 2006 13:21:12 +0200
+
+libgnomeprint (2.12.1-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Josselin Mouette <joss@debian.org>  Sat,  7 Jan 2006 17:25:45 +0100
+
+libgnomeprint (2.12.1-2) experimental; urgency=low
+
+  * Patch from Michel Daenzer to fix FTBFS (closes: #333727) :
+    + Add missing build dependency on flex and bison.
+    + filters_missing_libs.patch: link with -lm as well.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 15 Oct 2005 17:29:01 +0200
+
+libgnomeprint (2.12.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * watch: update for 2.12.
+  * copyright: update upstream location.
+  * 00_lower_pango_requirement.patch: removed, we now have pango 1.8 in
+    testing.
+  * filters_missing_libs.patch: explicitly link with -lglib-2.0
+    -lgobject-2.0 to avoid (legitimate) complaints from -Wl,-z,defs.
+  * rules:
+    + Bump shlibs version.
+    + Don't set DH_VERBOSE.
+  * control.in: 
+    + Build-depend on debhelper 4.1 (for cdbs).
+    + Conflict with libgnomeprintui << 2.12 as it uses symbols that were 
+      removed (hopefully this is the only package to use them).
+  * compat: use level 4.
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 11 Oct 2005 22:45:20 +0200
+
+libgnomeprint (2.10.3-3) unstable; urgency=low
+
+  * Add cupsys Recommends; see #261179, #274333, and #325434 for the rationale
+    behind pulling cupsys by default but permitting the user to remove it if
+    he configures a remote CUPS/IPP server.
+    [debian/control, debian/control.in]
+  * Misc fixes in copyright file; [debian/copyright]
+  * Bump Standards-Version to 3.6.2. [debian/control, debian/control.in]
+  * Remove trailing spaces in control file.
+    [debian/control.in, debian/control]
+  * Replace "=" and ":=" in makefile with "+=". [debian/rules]
+  * Use DEB_DH_MAKESHLIBS_ARGS_libgnomeprint2.2-0 instead of
+    DEB_DH_MAKESHLIBS_ARGS_ALL. [debian/rules]
+  * Exclude /usr/lib/libgnomeprint/ from shlibs dh_makeshlibs since we're not
+    using shlibs for these libs. [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Sun, 18 Sep 2005 18:02:36 +0200
+
+libgnomeprint (2.10.3-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Josselin Mouette <joss@debian.org>  Thu,  9 Jun 2005 23:27:13 +0200
+
+libgnomeprint (2.10.3-1) experimental; urgency=low
+
+  * New upstream release
+  * [debian/control.in] Versioned the libgnomecups1.0-dev build dependency
+    as per configure.in .
+  * Upload to experimental as the required libgnomecups is being held back
+    from transitioning to sarge (#302687).
+  * A problem with the custom location being broken under Generic PS was fixed
+    upstream in 2.10.1. (Closes: #293397)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 17 Apr 2005 15:26:09 +0200
+
+libgnomeprint (2.10.3-0ubuntu1) hoary; urgency=low
+
+  * New upstream release:
+    - fix the issue with PDF printing (Hoary: #8407).
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri,  1 Apr 2005 00:07:37 +0200
+
+libgnomeprint (2.10.2-0ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - updated the shlibs.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 23 Mar 2005 21:40:36 +0100
+
+libgnomeprint (2.10.1-0ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 16 Mar 2005 18:22:04 +0100
+
+libgnomeprint (2.10.0-0ubuntu2) hoary; urgency=low
+
+  * debian/control.in:
+    - updated the Build-Depends.
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue,  8 Mar 2005 17:01:38 +0100
+
+libgnomeprint (2.10.0-0ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - updated the shlibs.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue,  8 Mar 2005 12:43:28 +0100
+
+libgnomeprint (2.8.2-1) unstable; urgency=medium
+ 
+  * New upstream release
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sat,  1 Jan 2005 12:15:34 +0100
+
+libgnomeprint (2.8.1-1) unstable; urgency=medium
+ 
+  * New upstream release
+
+ -- Rob Taylor <robtaylor@fastmail.fm>  Mon, 29 Nov 2004 11:33:19 +0000 
+  
+libgnomeprint (2.8.0.1-2) unstable; urgency=medium
+ 
+  * updated shlibs to force usage of > 2.8.0-1 (Closes: #278136).
+
+ -- Rob Taylor <robtaylor@fastmail.fm>  Tue, 26 Oct 2004 14:29:14 +0100
+  
+libgnomeprint (2.8.0.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Tue,  5 Oct 2004 18:09:23 +0200
+
+libgnomeprint (2.8.0-3) unstable; urgency=high
+
+  * [debian/libgnomeprint2.2-doc.links] Added; make the documentation
+    accessible through devhelp.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Wed, 22 Sep 2004 22:53:31 +0200
+
+libgnomeprint (2.8.0-2) unstable; urgency=medium
+
+  * Upload to unstable, at upstream's explicit recommendation. libgnomeprint
+    2.8 is described as "2.6 - the apology". The most important improvements
+    compared to 2.6.2-3 previously in unstable are:
+    * A fixed PDF backend
+    * No more CUPS-related lockups.
+  * [debian/patches/00_lower_pango_requirement.patch] Added, ensure we can
+    build against sid's pango 1.4.
+  * [debian/patches/00fix_handle_ttc_font] Removed (integrated upstream).
+  * [debian/control.in] Loosened the pango build dependency.
+  * [debian/watch] Updated.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 16 Sep 2004 22:42:31 +0200
+
+libgnomeprint (2.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * [debian/patches/01_resolve_cups_module_symbols_and_relibtoolise.patch]
+    Dropped. The relevant changes have already been integrated upstream.
+  * [debian/control.in] Bumped pango build dependency as per configure.in .
+    Added build dependency on libgnomecups1.0-dev as that's now needed for
+    CUPS support.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon, 13 Sep 2004 20:43:06 +0200
+
+libgnomeprint (2.6.2-3) unstable; urgency=low
+
+  * [debian/control.in] Added missing libpopt-dev build dependency.
+    (Closes: #261940)
+  * [debian/patches/01_resolve_cups_module_symbols_and_relibtoolise.patch]
+    Added; make all symbols resolvable. (Closes: #256955)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun,  1 Aug 2004 17:42:01 +0200
+
+libgnomeprint (2.6.2-2) unstable; urgency=low
+
+  * Apply patch to handle ttc font same as ttf. (closes: #259682)
+
+ -- Takuo KITAME <kitame@debian.org>  Sat, 17 Jul 2004 20:23:20 +0900
+
+libgnomeprint (2.6.2-1) unstable; urgency=medium
+  
+  * upgrade to new upstream
+  * Fixed debian/watch to use pasv
+
+ -- Rob Taylor <robtaylor@fastmail.fm>  Thu, 24 Jun 2004 16:43:58 -0300
+
+libgnomeprint (2.6.1-7) unstable; urgency=medium
+
+  * [debian/rules] Bumped the dependencies in the shlibs file to safe ones.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 27 May 2004 15:55:29 +0200
+
+libgnomeprint (2.6.1-6) unstable; urgency=low
+
+  * Upload to unstable to handle CUPS transition from gnutls7 to gnutls10
+    there.
+  * [debian/control.in] Tightened build dependencies; cleaned up cupsys
+    dependencies.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Tue, 25 May 2004 17:55:45 +0200
+
+libgnomeprint (2.6.1-5) experimental; urgency=low
+  
+  * Updates cupsys2 dependencies to use libcupsys2-gnutls10
+
+ -- Rob Taylor <robtaylor@fastmail.fm>  Wed, 19 May 2004 15:39:58 -0300
+
+libgnomeprint (2.6.1-4) experimental; urgency=low
+
+  * Updated cupsys2 dependencies.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 29 Apr 2004 16:32:01 +0200
+
+libgnomeprint (2.6.1-3) experimental; urgency=low
+
+  Rob Taylor <robtaylor@fastmail.fm>:
+  * updated debian/libgnomeprint2.2-0.install for new upstream (Closes:
+    #246026)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Tue, 27 Apr 2004 21:28:42 +0200
+
+Libgnomeprint (2.6.1-2) experimental; urgency=low
+
+  * updated hard depends on cupsys2
+
+ -- Rob Taylor <robtaylor@fastmail.fm>  Mon, 26 Apr 2004 01:22:35 -0300
+
+libgnomeprint (2.6.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * [debian/rules] Set LDFLAGS to ensure the library has no dependencies on
+    undefined symbols and to speed up loading.
+  * [debian/control.in] Versioned the libart-2.0-dev build dependency to
+    ensure its shlibs are ok.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Wed, 21 Apr 2004 20:43:58 +0200
+
+libgnomeprint (2.6.0-3) experimental; urgency=low
+
+  Rob Taylor <robtaylor@fastmail.fm>
+  * [debian/rules] Restructured. Use cdbs.
+  J.H.M. Dassen (Ray) <jdassen@debian.org>
+  * [debian/control.in] Declare build dependency on cdbs.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 18 Apr 2004 16:55:15 +0200
+
+libgnomeprint (2.6.0-2) experimental; urgency=low
+
+  * [debian/control.in] Updated the cupsys build dependency. (Closes: #243849)
+    Also added an explicit strict runtime dependency to ensure we don't get
+    loaded against sid's libcupsys2 which is still linked against gnutls7.
+    (Hmm... maybe we should consider an epoch in experimental's cupsys version
+    numbering so we can distinguish between the gnutls7 and gnutls10 linked
+    versions while retaining the possibility of updating both)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 15 Apr 2004 09:45:20 +0200
+
+libgnomeprint (2.6.0-1) experimental; urgency=low
+
+  * GNOME 2.6 version.
+  * GNOME team upload.
+  * [patches/01_no_ppd.dpatch] Removed as it is no longer needed.
+  * [debian/control.in]
+    * Rob Taylor <robtaylor@fastmail.fm> is the primary maintainer.
+    * Tightened libglib2.0-dev and libpango1.0-dev build dependencies to be 
+      on the safe side.
+    * Added gnome-pkg-tools build dependency.
+    * Added a strict cupsys build dependency to ensure we build against a
+      cupsys linked against gnutls10.
+  * [debian/rules] Bump shlibs due to the switch to gnutls10-linked cupsys.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri, 26 Mar 2004 15:54:34 +0100
+
+libgnomeprint (2.4.2-4) unstable; urgency=low
+
+  * more, I
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 19 Mar 2004 16:18:48 +0100
+
+libgnomeprint (2.4.2-3) unstable; urgency=low
+
+  * Patch from bugzilla to fix a crash if ppd files are missing with cups
+    (Closes: #232561)
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 15 Feb 2004 13:59:54 +0100
+
+libgnomeprint (2.4.2-2) unstable; urgency=low
+
+  * debian/control libgnomeprint2.2-data don't need to depends on
+    libgnomeprint2.2-0 (circulary dependecy)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 31 Dec 2003 23:05:32 +0100
+
+libgnomeprint (2.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add versioned dependecy for libgnomeprint2.2-data (Closes: #220311)
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  6 Dec 2003 11:18:58 +0100
+
+libgnomeprint (2.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 18 Oct 2003 00:35:48 +0200
+
+libgnomeprint (2.2.1.3-3) unstable; urgency=low
+
+  * Rebuild to remove libgnutls5 dependency (Closes: #210498)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 24 Sep 2003 14:53:02 +0200
+
+libgnomeprint (2.2.1.3-2) unstable; urgency=low
+
+  * debian/control libgnomeprint2 should depends on same libgnomeprint2.2-data
+    version [Closes: #199735)
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  3 Jul 2003 00:50:29 +0200
+
+libgnomeprint (2.2.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 18 Jun 2003 18:42:19 +0200
+
+libgnomeprint (2.2.1.2-2) unstable; urgency=low
+
+  * Update section
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  1 Apr 2003 18:57:25 +0200
+
+libgnomeprint (2.2.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 12 Mar 2003 15:26:35 +0100
+
+libgnomeprint (2.2.1.1-2) unstable; urgency=low
+
+  * Forget to hack configure for mipsel
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  3 Feb 2003 17:35:22 +0100
+
+libgnomeprint (2.2.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  3 Feb 2003 10:04:38 +0100
+
+libgnomeprint (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 21 Jan 2003 15:51:46 +0100
+
+libgnomeprint (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 20 Jan 2003 11:26:27 +0100
+
+libgnomeprint (2.1.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 14 Jan 2003 12:27:18 +0100
+
+libgnomeprint (2.1.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rename packages in 2.2-0 instead of 2-0
+  * Build with cups support (Add libcupsys-dev in build-depends)
+  * Add libfontconfig-dev in build-depends and remove libfreetype6-dev
+  * Should fix gp-fontmap.c bug (Closes: #175117)
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  7 Jan 2003 14:45:35 +0100
+
+libgnomeprint (1.116.3-2) unstable; urgency=low
+
+  * Remove binary-indep target in binary-arch target
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  6 Jan 2003 20:17:00 +0100
+
+libgnomeprint (1.116.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update to standards version 3.5.8
+  * Move documentation files in -doc package.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 28 Dec 2002 17:22:21 +0100
+
+libgnomeprint (1.116.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update to standards version 3.5.7
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 15 Sep 2002 19:34:22 +0200
+
+libgnomeprint (1.116.0-2) unstable; urgency=low
+
+  * Remove symlink in -dev package in preinst otherwise -dev documentation
+    are installed in libgnomeprint2-0 doc directory. Also remove html doc in
+    the libgnomeprint2-0 package in preinst.
+  * Move generated file (gnome-print.fontmap) in /var/lib/gnome/libgnomeprint-2.0
+    and remove /var/lib/gnome/libgnomeprint-2.0 on purge.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 29 Jul 2002 16:11:43 +0200
+
+libgnomeprint (1.116.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Move documentation in the -dev package and add doc-base support.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 29 Jul 2002 14:33:07 +0200
+
+libgnomeprint (1.115.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  7 Jun 2002 11:34:54 +0200
+
+libgnomeprint (1.114.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Not a native Debian package (Closes: #148368)
+  * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
+    DEB_BUILD_OPTIONS
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 28 May 2002 15:04:36 +0200
+
+libgnomeprint (1.113.0-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 13 May 2002 14:58:42 +0200
+
+libgnomeprint (1.112.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 30 Mar 2002 23:21:56 +0100
+
+libgnomeprint (1.111.0-4) unstable; urgency=low
+
+  * Build against the latest libraries.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 24 Mar 2002 00:55:59 +0100
+
+libgnomeprint (1.111.0-3) unstable; urgency=low
+
+  * Build (again) against the latest libraries.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 25 Feb 2002 14:35:58 +0100
+
+libgnomeprint (1.111.0-2) unstable; urgency=low
+
+  * Build against the latest libraries.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 23 Feb 2002 11:18:38 +0100
+
+libgnomeprint (1.111.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 14 Feb 2002 14:34:03 +0100
+
+libgnomeprint (1.110.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Improve the depends filed for libgnomeprint2-dev
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  2 Feb 2002 14:59:12 +0100
+
+libgnomeprint (1.109.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 18 Jan 2002 15:12:02 +0100
+
+libgnomeprint (1.108.0-1) unstable; urgency=low
+
+  * New upstream relase.
+  * debian/control Spell check (Closes: #124969, #124968, #124967)
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 24 Dec 2001 01:46:43 +0100
+
+libgnomeprint (1.107.0-2) unstable; urgency=low
+
+  * Add build-depends to gettext
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 11 Dec 2001 15:30:47 +0100
+
+libgnomeprint (1.107.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  3 Dec 2001 20:11:18 +0100
+
+libgnomeprint (1.106.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 19 Nov 2001 18:18:11 +0100
+
+Local variables:
+mode: debian-changelog
+End:
--- libgnomeprint-2.18.7.orig/debian/watch
+++ libgnomeprint-2.18.7/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://ftp.gnome.org/pub/gnome/sources/libgnomeprint/([\d\.]+)/libgnomeprint-([\d\.]+)\.tar\.gz
--- libgnomeprint-2.18.7.orig/debian/control.in
+++ libgnomeprint-2.18.7/debian/control.in
@@ -0,0 +1,104 @@
+Source: libgnomeprint
+Section: libs
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.41),
+               gnome-pkg-tools (>= 0.10),
+               dpkg-dev (>= 1.13.19),
+               zlib1g-dev,
+               libxml2-dev,
+               libfontconfig1-dev,
+               libglib2.0-dev (>= 2.4.1-2),
+               libpango1.0-dev (>= 1.4.1-2),
+               libcups2-dev (>= 1.1.20final+cvs20040330-4),
+               libgnomecups1.0-dev (>= 0.2.0),
+               libart-2.0-dev (>= 2.3.16-5),
+               bison,
+               flex,
+               intltool (>= 0.35.0)
+Build-Depends-Indep: libglib2.0-doc,
+                     libpango1.0-doc
+
+Package: libgnomeprint2.2-0
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgnomeprint2.2-data (= ${source:Version})
+Conflicts: libgnomeprintui2.2-0 (<< 2.12)
+Suggests: cups
+Description: The GNOME print architecture - runtime files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
+
+Package: libgnomeprint2.2-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgnomeprint2.2-0 (= ${binary:Version}),
+         libart-2.0-dev,
+         libxml2-dev,
+         libglib2.0-dev,
+         zlib1g-dev,
+         libpango1.0-dev
+Suggests: libgnomeprint2.2-doc
+Description: The GNOME print architecture - development files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
+
+Package: libgnomeprint2.2-data
+Architecture: all
+Section: libs
+Depends: ${misc:Depends}
+Description: The GNOME print architecture - data files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
+
+Package: libgnomeprint2.2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: doc-base
+Description: The GNOME print architecture - documentation files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
--- libgnomeprint-2.18.7.orig/debian/copyright
+++ libgnomeprint-2.18.7/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Christian Marillat <marillat@debian.org> on
+Mon, 19 Nov 2001 18:18:11 +0100.
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/
+
+Copyright Holder: The full list of upstream authors is in the AUTHORS file,
+                  under /usr/share/doc/libgnomeprint2*.
+
+License:
+
+   This package 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 of the License, or
+   (at your option) any later version.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-0.install
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-0.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libgnomeprint-2-2.so.*
+debian/tmp/usr/lib/libgnomeprint/*/modules/*.so
+debian/tmp/usr/lib/libgnomeprint/*/modules/transports/*.so
--- libgnomeprint-2.18.7.orig/debian/control
+++ libgnomeprint-2.18.7/debian/control
@@ -0,0 +1,109 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: libgnomeprint
+Section: libs
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.41),
+               gnome-pkg-tools (>= 0.10),
+               dpkg-dev (>= 1.13.19),
+               zlib1g-dev,
+               libxml2-dev,
+               libfontconfig1-dev,
+               libglib2.0-dev (>= 2.4.1-2),
+               libpango1.0-dev (>= 1.4.1-2),
+               libcups2-dev (>= 1.1.20final+cvs20040330-4),
+               libgnomecups1.0-dev (>= 0.2.0),
+               libart-2.0-dev (>= 2.3.16-5),
+               bison,
+               flex,
+               intltool (>= 0.35.0)
+Build-Depends-Indep: libglib2.0-doc,
+                     libpango1.0-doc
+
+Package: libgnomeprint2.2-0
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgnomeprint2.2-data (= ${source:Version})
+Conflicts: libgnomeprintui2.2-0 (<< 2.12)
+Suggests: cups
+Description: The GNOME print architecture - runtime files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
+
+Package: libgnomeprint2.2-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgnomeprint2.2-0 (= ${binary:Version}),
+         libart-2.0-dev,
+         libxml2-dev,
+         libglib2.0-dev,
+         zlib1g-dev,
+         libpango1.0-dev
+Suggests: libgnomeprint2.2-doc
+Description: The GNOME print architecture - development files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
+
+Package: libgnomeprint2.2-data
+Architecture: all
+Section: libs
+Depends: ${misc:Depends}
+Description: The GNOME print architecture - data files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
+
+Package: libgnomeprint2.2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: doc-base
+Description: The GNOME print architecture - documentation files
+ The goals of this architecture include:
+ .
+  * Absolutely uncompromised output quality
+  * Speed, memory efficiency, and other related performance goals
+  * Ability to work smoothly with Postscript printers, fonts, and other
+    resources
+  * A screen display derived from the Canvas
+  * An extension path for a wide variety of Unicode scripts
+  * An extension path for a richer set of graphics operators than Postscript
+    supports, especially transparency
+  * To make life as easy as possible for application developers
--- libgnomeprint-2.18.7.orig/debian/rules
+++ libgnomeprint-2.18.7/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols.
+LDFLAGS += -Wl,-z,defs
+
+# Speed up loading.
+LDFLAGS += -Wl,-O1
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc
+# pay attention to the trailing "/"
+DEB_DH_MAKESHLIBS_ARGS_libgnomeprint2.2-0 += -X /usr/lib/libgnomeprint/ \
+        -V 'libgnomeprint2.2-0 (>= 2.17.0)'
+
--- libgnomeprint-2.18.7.orig/debian/compat
+++ libgnomeprint-2.18.7/debian/compat
@@ -0,0 +1 @@
+5
--- libgnomeprint-2.18.7.orig/debian/libgnomeprint2.2-dev.install
+++ libgnomeprint-2.18.7/debian/libgnomeprint2.2-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libgnomeprint-2-2.a
+debian/tmp/usr/lib/libgnomeprint-2-2.so
--- libgnomeprint-2.18.7.orig/debian/patches/12_cups-transport.patch
+++ libgnomeprint-2.18.7/debian/patches/12_cups-transport.patch
@@ -0,0 +1,198 @@
+diff -Nur libgnomeprint-2.12.1/libgnomeprint/modules/cups/gnome-print-cups-transport.c libgnomeprint-2.12.1.new/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+--- libgnomeprint-2.12.1/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2004-12-03 16:32:12.000000000 +0100
++++ libgnomeprint-2.12.1.new/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2006-06-07 10:05:20.000000000 +0200
+@@ -42,6 +42,8 @@
+ #include <libgnomeprint/gnome-print-transport.h>
+ #include <libgnomeprint/gnome-print-config.h>
+ 
++#include <libgnomecups/gnome-cups-printer.h>
++
+ #define GP_TYPE_TRANSPORT_CUPS         (gp_transport_cups_get_type ())
+ #define GP_TRANSPORT_CUPS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GP_TYPE_TRANSPORT_CUPS, GPTransportCups))
+ #define GP_TRANSPORT_CUPS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GP_TYPE_TRANSPORT_CUPS, GPTransportCupsClass))
+@@ -202,10 +204,23 @@
+ }
+ 
+ static gint
+-get_job_options (GnomePrintConfig *config, cups_option_t **options)
++add_job_options (GnomePrintConfig *config, gint num_options, cups_option_t **options)
+ {
+-	gchar *value;
+-	gint num = 0;
++	gchar *value, *n_up, *orient;
++	gint num = num_options;
++	gboolean duplex, tumble;
++
++	/* Paper Size */
++
++	value = gnome_print_config_get (config, GNOME_PRINT_KEY_PAPER_SIZE);
++
++	if (value != NULL) {
++		num = cupsAddOption ("PageSize", value, num, options);
++		num = cupsAddOption ("PageRegion", value, num, options);
++		g_free (value);
++	}
++
++	/* Paper Source */
+ 
+ 	value = gnome_print_config_get (config, GNOME_PRINT_KEY_PAPER_SOURCE);
+ 
+@@ -214,6 +229,60 @@
+ 		g_free (value);
+ 	}
+ 	
++	/* Page Orientation */
++
++	orient = gnome_print_config_get (config, GNOME_PRINT_KEY_PAGE_ORIENTATION);
++
++	if (strcmp (orient, "R0") == 0)
++		value = "3";
++	else if (strcmp (orient, "R90") == 0)
++		value = "4";
++	else if (strcmp (orient, "R180") == 0)
++		value = "6";
++	else if (strcmp (orient, "R270") == 0)
++		value = "5";
++	else
++		value = NULL;
++
++	g_free (orient);
++
++	if (value != NULL) {
++		num = cupsAddOption ("orientation-requested", value, num, options);
++	}
++
++	/* Duplex and Tumble */
++
++	gnome_print_config_get_boolean (config, GNOME_PRINT_KEY_DUPLEX, &duplex);
++	gnome_print_config_get_boolean (config, GNOME_PRINT_KEY_TUMBLE, &tumble);
++
++	if (!duplex)
++		value = "one-sided";
++	else if (!tumble)
++		value = "two-sided-long-edge";
++	else
++		value = "two-sided-long-edge";
++
++	num = cupsAddOption ("sides", value, num, options);
++
++	/* 2 pages to 1 and 4 pages to 1 */
++
++	n_up = gnome_print_config_get (config, GNOME_PRINT_KEY_LAYOUT);
++
++	if (strcmp (n_up, "2_1") == 0)
++		value = "2";
++	else if (strcmp (n_up, "4_1") == 0)
++		value = "4";
++	else
++		value = NULL;
++
++	g_free (n_up);
++
++	if (value != NULL) {
++		num = cupsAddOption ("number-up", value, num, options);
++	}
++
++	/* Job Hold */
++
+ 	value = gnome_print_config_get (config, GNOME_PRINT_KEY_HOLD);
+ 
+ 	if (value != NULL) {
+@@ -224,14 +293,36 @@
+ 	return num;
+ }
+ 	
++static gint
++convert_and_add_to_cups_options (GList *options, gint num_options, cups_option_t **cups_options)
++{
++	gint num, i;
++	GList *l;
++
++	num = g_list_length (options);
++
++	if (num > 0) {
++		num = num_options;
++		for (l = options, i = 0; l != NULL; l = l->next, i++) {
++			GnomeCupsPrinterOption *option = l->data;
++			num = cupsAddOption (option->id, option->value, num, cups_options);
++		}
++	} else {
++		cups_options = NULL;
++	}
++
++	return num;
++}
+ 
+ static gint
+ gp_transport_cups_close (GnomePrintTransport *gp_transport)
+ {
+ 	GPTransportCups *transport;
+ 	cups_option_t *options;
+-	gint num_options;
++	gint num_options = 0;
+ 	char *title;
++	GnomeCupsPrinter *printer;
++	GList *ppd_and_lpoptions;
+ 
+ 	transport = GP_TRANSPORT_CUPS (gp_transport);
+ 
+@@ -246,8 +337,15 @@
+ 
+ 	title = gnome_print_config_get (gp_transport->config, 
+ 					GNOME_PRINT_KEY_DOCUMENT_NAME);
+-	num_options = get_job_options (gp_transport->config, &options);
++
++	printer = gnome_cups_printer_get (transport->printer);
+ 	
++	ppd_and_lpoptions = gnome_cups_printer_get_options (printer);
++	num_options = convert_and_add_to_cups_options (ppd_and_lpoptions, num_options, &options);
++	gnome_cups_printer_option_list_free (ppd_and_lpoptions);
++
++	num_options = add_job_options (gp_transport->config, num_options, &options);
++
+ 	cupsPrintFile (transport->printer, 
+ 		       transport->temp_file, 
+ 		       title, num_options, options);
+@@ -256,6 +354,8 @@
+ 	unlink (transport->temp_file);
+ 	g_free (title);
+ 	
++	gnome_cups_printer_unref (printer);
++	
+ 	return GNOME_PRINT_OK;
+ }
+ 
+@@ -291,14 +391,22 @@
+ {
+ 	GPTransportCups *transport;
+ 	cups_option_t *options;
+-	gint num_options;
++	gint num_options = 0;
+ 	char *title;
++	GnomeCupsPrinter *printer;
++	GList *ppd_and_lpoptions;
+ 
+ 	transport = GP_TRANSPORT_CUPS (gp_transport);
+ 
+ 	title = gnome_print_config_get (gp_transport->config, 
+ 					GNOME_PRINT_KEY_DOCUMENT_NAME);
+-	num_options = get_job_options (gp_transport->config, &options);
++	printer = gnome_cups_printer_get (transport->printer);
++
++	ppd_and_lpoptions = gnome_cups_printer_get_options (printer);
++	num_options = convert_and_add_to_cups_options (ppd_and_lpoptions, num_options, &options);
++	gnome_cups_printer_option_list_free (ppd_and_lpoptions);
++
++	num_options = add_job_options (gp_transport->config, num_options, &options);
+ 	
+ 	cupsPrintFile (transport->printer, 
+ 		       filename, title, 
+@@ -307,6 +415,8 @@
+ 
+ 	g_free (title);
+ 	
++	gnome_cups_printer_unref (printer);
++
+ 	return GNOME_PRINT_OK;
+ }
+ 
