Imported Debian patch 5.0.1-3

6 files changed, 15 insertions, 98 deletions

diff --git a/debian/changelog b/debian/changelog
index 72caf9e..807469f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gutenprint (5.0.1-3) unstable; urgency=low
+
+  * debian/control: Remove libgutenprintui1-1 and libgutenprintui-dev,
+  * debian/rules: Disable libgutenprintui when running configure.  Remove
+    libgutenprintui1-1 from search path for dh_shlibdeps.
+    as well as libgtk1.2-dev build dependency.
+  * debian/libgutenprintui1-1.install: Remove.
+  * debian/libgutenprintui1-dev.install: Remove. 
+
+ -- Roger Leigh <rleigh@debian.org>  Sun, 22 Jul 2007 18:46:29 +0100
+
 gutenprint (5.0.1-2) unstable; urgency=low
 
   * debian/control.in: Use ${binary:Version} and ${source:Version} in
diff --git a/debian/control b/debian/control
index 2d34f4d..6feab26 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 (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
 
 Package: gimp-print
 Architecture: any
@@ -114,51 +114,6 @@ Description: runtime for the Gutenprint printer driver library
  many cases, and can be used for many of the most demanding printing
  tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgutenprintui1-dev
-Architecture: any
-Section: devel
-Depends: libgutenprintui1-1 (= ${binary:Version}), pkg-config (>= 0.14.0)
-Suggests: libgutenprint-doc (= ${source:Version})
-Description: development files for the Gutenprint printer driver user interface library
- This package contains the header files for the libgutenprintui
- library, along with a static version of libgutenprintui.
- libgutenprintui contains GTK+ widgets which may be used for print
- dialogs etc. for use with libgutenprint.
- .
- Install this package if you wish to develop packages that use
- libgutenprintui.  This package is intended for use only by cinepaint
- and gimp-1.2.
- .
- This is Gutenprint version 5.0.1, a stable
- development release in the 5.0 line.
- .
- Gutenprint is the print facility for the GIMP, and in addition a
- suite of drivers that may be used with common UNIX spooling systems
- using GhostScript or CUPS.  These drivers provide printing quality
- for UNIX/Linux on a par with proprietary vendor-supplied drivers in
- many cases, and can be used for many of the most demanding printing
- tasks.  Gutenprint was formerly known as Gimp-Print.
-
-Package: libgutenprintui1-1
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Recommends: gutenprint-locales (>= ${source:Version})
-Description: runtime for the Gutenprint printer driver user interface library
- This package includes the libgutenprintui library.  libgutenprintui
- contains GTK+ widgets which may be used for print dialogs etc. for
- use with libgutenprint.
- .
- This is Gutenprint version 5.0.1, a stable
- development release in the 5.0 line.
- .
- Gutenprint is the print facility for the GIMP, and in addition a
- suite of drivers that may be used with common UNIX spooling systems
- using GhostScript or CUPS.  These drivers provide printing quality
- for UNIX/Linux on a par with proprietary vendor-supplied drivers in
- many cases, and can be used for many of the most demanding printing
- tasks.  Gutenprint was formerly known as Gimp-Print.
-
 Package: libgutenprintui2-dev
 Architecture: any
 Section: devel
diff --git a/debian/control.in b/debian/control.in
index e659829..815b9ef 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 (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 5.0.0), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
 
 Package: gimp-print
 Architecture: any
@@ -114,51 +114,6 @@ Description: runtime for the Gutenprint printer driver library
  many cases, and can be used for many of the most demanding printing
  tasks.  Gutenprint was formerly known as Gimp-Print.
 
-Package: libgutenprintui1-dev
-Architecture: any
-Section: devel
-Depends: libgutenprintui1-#LIBRARYUI_VERSION# (= ${binary:Version}), pkg-config (>= 0.14.0)
-Suggests: libgutenprint-doc (= ${source:Version})
-Description: development files for the Gutenprint printer driver user interface library
- This package contains the header files for the libgutenprintui
- library, along with a static version of libgutenprintui.
- libgutenprintui contains GTK+ widgets which may be used for print
- dialogs etc. for use with libgutenprint.
- .
- Install this package if you wish to develop packages that use
- libgutenprintui.  This package is intended for use only by cinepaint
- and gimp-1.2.
- .
- This is Gutenprint version #UPSTREAM_VERSION#, a stable
- development release in the 5.0 line.
- .
- Gutenprint is the print facility for the GIMP, and in addition a
- suite of drivers that may be used with common UNIX spooling systems
- using GhostScript or CUPS.  These drivers provide printing quality
- for UNIX/Linux on a par with proprietary vendor-supplied drivers in
- many cases, and can be used for many of the most demanding printing
- tasks.  Gutenprint was formerly known as Gimp-Print.
-
-Package: libgutenprintui1-#LIBRARYUI_VERSION#
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Recommends: gutenprint-locales (>= ${source:Version})
-Description: runtime for the Gutenprint printer driver user interface library
- This package includes the libgutenprintui library.  libgutenprintui
- contains GTK+ widgets which may be used for print dialogs etc. for
- use with libgutenprint.
- .
- This is Gutenprint version #UPSTREAM_VERSION#, a stable
- development release in the 5.0 line.
- .
- Gutenprint is the print facility for the GIMP, and in addition a
- suite of drivers that may be used with common UNIX spooling systems
- using GhostScript or CUPS.  These drivers provide printing quality
- for UNIX/Linux on a par with proprietary vendor-supplied drivers in
- many cases, and can be used for many of the most demanding printing
- tasks.  Gutenprint was formerly known as Gimp-Print.
-
 Package: libgutenprintui2-dev
 Architecture: any
 Section: devel
diff --git a/debian/libgutenprintui1-1.install b/debian/libgutenprintui1-1.install
deleted file mode 100644
index ed8acb5..0000000
--- a/debian/libgutenprintui1-1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/install/usr/lib/libgutenprintui.so.*  usr/lib
diff --git a/debian/libgutenprintui1-dev.install b/debian/libgutenprintui1-dev.install
deleted file mode 100644
index 5823133..0000000
--- a/debian/libgutenprintui1-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/install/usr/lib/libgutenprintui.so          usr/lib
-debian/install/usr/lib/pkgconfig/gutenprintui.pc   usr/lib/pkgconfig
-debian/install/usr/include/gutenprintui            usr/include
diff --git a/debian/rules b/debian/rules
index 6eee8a3..07ab23e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ autoconfigure-stamp: debian/control $(GENERATED_FILES)
 	  --prefix=/usr --mandir=\$${prefix}/share/man \
 	  --disable-static --enable-shared --disable-rpath \
 	  --with-modules=dlopen \
-	  --enable-libgutenprintui --enable-libgutenprintui2 \
+	  --disable-libgutenprintui --enable-libgutenprintui2 \
 	  --without-gimp --with-gimp2 --with-cups --with-ijs \
 	  --with-foomatic --with-foomatic3 \
 	  --disable-test \
@@ -132,7 +132,7 @@ binary-arch: build install
 	chrpath --delete debian/cupsys-driver-gutenprint/usr/sbin/cups-genppd.5.0
 	dh_makeshlibs -a -V -X usr/lib/gutenprint
 	dh_installdeb -a
-	dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui1-$(LIBRARYUI_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib
+	dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a