diff options
author | Till Kamppeter <till.kamppeter@gmail.com> | 2011-08-01 18:29:47 +0200 |
---|---|---|
committer | Till Kamppeter <till.kamppeter@gmail.com> | 2011-08-01 18:29:47 +0200 |
commit | edfbb2100ac9e7e502bd62c9f6be6995802e0c09 (patch) | |
tree | 782a4e885dbbae734293fdbbd19519c76797c97a | |
parent | bcdf7de0088a48b17d648d27666d120feb322c19 (diff) |
Release 20110722-0ubuntu3.
-rw-r--r-- | debian/changelog | 13 | ||||
-rw-r--r-- | debian/control | 16 | ||||
-rw-r--r-- | debian/foomatic-db.install (renamed from debian/foomatic-db-xml.install) | 0 | ||||
-rw-r--r-- | debian/foomatic-db.postinst (renamed from debian/foomatic-db-xml.postinst) | 2 | ||||
-rwxr-xr-x | debian/rules | 2 |
5 files changed, 23 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 5809b976..af20cafe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +foomatic-db (20110722-0ubuntu3) oneiric; urgency=low + + * debian/control, debian/rules, debian/foomatic-db-xml.install, + debian/foomatic-db.install, debian/foomatic-db-xml.postinst, + debian/foomatic-db.postinst: Renamed the foomatic-db-xml binary package + (Foomatic XML database) back to foomatic-db-xml, providing foomatic-db-xml + as virtual package. The renaming of a binary package is not accepted + by Debian. Driver packages which need the XMLs for building have to + Build-Depend on foomatic-db and Build-Conflict with + foomatic-db-compressed-ppds. + + -- Till Kamppeter <till.kamppeter@gmail.com> Mon, 1 Aug 2011 18:22:03 +0200 + foomatic-db (20110722-0ubuntu2) oneiric; urgency=low * debian/control, debian/rules, debian/foomatic-db.install, diff --git a/debian/control b/debian/control index a940e351..5fb04f26 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-xml +Package: foomatic-db Architecture: all Depends: ${misc:Depends} Recommends: foomatic-db-engine, @@ -39,10 +39,10 @@ Suggests: cups-driver-gutenprint | foomatic-db-gutenprint, # 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, foomatic-db (<< 20110722-0ubuntu2) -Provides: foomatic-db-hpijs, foomatic-db +Replaces: foomatic-db-hpijs, foomatic-db-xml (= 20110722-0ubuntu2) +Provides: foomatic-db-hpijs, foomatic-db-xml Conflicts: foomatic-db-hpijs -Breaks: foomatic-filters (<< 4.0), foomatic-db (<< 20110722-0ubuntu2) +Breaks: foomatic-filters (<< 4.0), foomatic-db-xml (= 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), foomatic-db (<< 20110722-0ubuntu2) +Breaks: foomatic-filters (<< 4.0), foomatic-db Provides: foomatic-db Conflicts: foomatic-db, foomatic-db-hpijs Replaces: foomatic-db, foomatic-db-hpijs @@ -133,12 +133,12 @@ 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 +Package: foomatic-db-xml Architecture: all -Depends: foomatic-db-xml, ${misc:Depends} +Depends: foomatic-db, ${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 + foomatic-db-xml package (the package is renamed back to foomatic-db). It may safely be removed after installation. Package: openprinting-ppds-extra diff --git a/debian/foomatic-db-xml.install b/debian/foomatic-db.install index ffe6e544..ffe6e544 100644 --- a/debian/foomatic-db-xml.install +++ b/debian/foomatic-db.install diff --git a/debian/foomatic-db-xml.postinst b/debian/foomatic-db.postinst index 02a1d2d4..c13d4247 100644 --- a/debian/foomatic-db-xml.postinst +++ b/debian/foomatic-db.postinst @@ -1,5 +1,5 @@ #! /bin/sh -# postinst script for foomatic-db-xml +# postinst script for foomatic-db # $Id: $ # # see: dh_installdeb(1) diff --git a/debian/rules b/debian/rules index dd37739e..2f766788 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-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:'` + 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:'` # Compress the PPD files with Vitor Baptista's pyppd PPD # archiving tool. This makes the space needed for PPDs at least |