Release of 20110722-0ubuntu2

5 files changed, 29 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 9fb1fb2d..5809b976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+foomatic-db (20110722-0ubuntu2) oneiric; urgency=low
+
+  * debian/control, debian/rules, debian/foomatic-db.install,
+    debian/foomatic-db-xml.install, debian/foomatic-db.postinst,
+    debian/foomatic-db-xml.postinst: Renamed the foomatic-db binary package
+    (Foomatic XML database) to foomatic-db-xml, providing foomatic-db as
+    virtual package. This way the buildds can explicitly install the XML
+    database if it is requested by Build-Depends: in the package to be built.
+  * debian/rules: Moved apport hook into the foomatic-db-compressed-ppds
+    package as this package is usually installed.
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Thu, 28 Jul 2011 13:21:03 +0200
+
 foomatic-db (20110722-0ubuntu1) oneiric; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d6dbcf75..a940e351 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: git://git.debian.org/collab-maint/foomatic-db.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/foomatic-db.git
 Standards-Version: 3.9.2.0
 
-Package: foomatic-db
+Package: foomatic-db-xml
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: foomatic-db-engine,
@@ -36,13 +36,13 @@ Suggests: cups-driver-gutenprint | foomatic-db-gutenprint,
           c2esp
 # 20110520 introduces printers needing the following drivers, yet to be packaged:
 # rastertosag-gdi
-Breaks: foomatic-filters (<< 4.0)
 # foomatic-db-hpijs:
 # Debian: was in Lenny, can be removed in Wheezy
 # Ubuntu: was in Jaunty, can be removed in Lucid + 1 LTS
-Replaces: foomatic-db-hpijs
-Provides: foomatic-db-hpijs
+Replaces: foomatic-db-hpijs, foomatic-db (<< 20110722-0ubuntu2)
+Provides: foomatic-db-hpijs, foomatic-db
 Conflicts: foomatic-db-hpijs
+Breaks: foomatic-filters (<< 4.0), foomatic-db (<< 20110722-0ubuntu2)
 Description: OpenPrinting printer support - database
  Foomatic is a printing system designed to make it easier to set up
  common printers for use with Debian (and other operating systems).
@@ -82,7 +82,7 @@ Suggests: cups-driver-gutenprint | foomatic-db-gutenprint,
 # foomatic-filters (<< 4.0):
 # Debian: was in Lenny, can be removed in Wheezy
 # Ubuntu: was in Hardy, can be removed in Lucid
-Breaks: foomatic-filters (<< 4.0)
+Breaks: foomatic-filters (<< 4.0), foomatic-db (<< 20110722-0ubuntu2)
 Provides: foomatic-db
 Conflicts: foomatic-db, foomatic-db-hpijs
 Replaces: foomatic-db, foomatic-db-hpijs
@@ -133,6 +133,14 @@ Description: OpenPrinting printer support - PostScript PPD files
  other media with the printer, or downloadable from the OpenPrinting
  web site (even automatically if the printer setup tool supports it).
 
+Package: foomatic-db
+Architecture: all
+Depends: foomatic-db-xml, ${misc:Depends}
+Description: Transitional package
+ This dummy package is provided for a smooth transition from the previous
+ foomatic-db package (the package is renamed to foomatic-db-xml). It may
+ safely be removed after installation.
+
 Package: openprinting-ppds-extra
 Architecture: all
 Depends: openprinting-ppds, ${misc:Depends}
diff --git a/debian/foomatic-db.install b/debian/foomatic-db-xml.install
index ffe6e544..ffe6e544 100644
--- a/debian/foomatic-db.install
+++ b/debian/foomatic-db-xml.install
diff --git a/debian/foomatic-db.postinst b/debian/foomatic-db-xml.postinst
index c13d4247..02a1d2d4 100644
--- a/debian/foomatic-db.postinst
+++ b/debian/foomatic-db-xml.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for foomatic-db
+# postinst script for foomatic-db-xml
 # $Id: $
 #
 # see: dh_installdeb(1)
diff --git a/debian/rules b/debian/rules
index bc23edbb..dd37739e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ override_dh_install:
 	dh_install --list-missing
 
 	# Pre-build PPD files for foomatic-db-compressed-ppds
-	FOOMATICDB=$(CURDIR)/debian/foomatic-db/usr/share/foomatic foomatic-compiledb -j 16 -t ppd -d $(CURDIR)/foomatic `ls -1 $(CURDIR)/debian/foomatic-db/usr/share/foomatic/db/source/driver/*.xml | perl -p -e 's:^.*db/source/driver/(\S*)\.xml\s*$$:\1\n:'`
+	FOOMATICDB=$(CURDIR)/debian/foomatic-db-xml/usr/share/foomatic foomatic-compiledb -j 16 -t ppd -d $(CURDIR)/foomatic `ls -1 $(CURDIR)/debian/foomatic-db-xml/usr/share/foomatic/db/source/driver/*.xml | perl -p -e 's:^.*db/source/driver/(\S*)\.xml\s*$$:\1\n:'`
 
 	# Compress the PPD files with Vitor Baptista's pyppd PPD
 	# archiving tool. This makes the space needed for PPDs at least
@@ -64,5 +64,5 @@ override_dh_install:
 
 	# Install the apport hook on Ubuntu and derivatives
 ifeq ($(derives_from_ubuntu),yes)
-	install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/foomatic-db/usr/share/apport/package-hooks/source_foomatic-db.py
+	install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/foomatic-db-compressed-ppds/usr/share/apport/package-hooks/source_foomatic-db.py
 endif