Merged openprinting-ppds and openprinting-ppds-extra.

6 files changed, 23 insertions, 128 deletions

diff --git a/debian/changelog b/debian/changelog
index d8035a96..89670339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+foomatic-db (20100806-0ubuntu6) maverick; urgency=low
+
+  * debian/control, debian/rules, debian/openprinting-ppds-extra.install,
+    debian/openprinting-ppds-extra.postinst, debian/openprinting-ppds.install:
+    Merged the binary packages openprinting-ppds and openprinting-ppds-extra.
+    The splitting was formerly introduced to save space on the Ubuntu Desktop
+    CD. The new PPD compression saves much more space and allows to put the
+    PPDs from openprinting-ppds-extra back onto the CD. So now the splitting
+    does nothing more than making maintenance of this package more complicated.
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Thu, 12 Aug 2010 09:13:03 +0200
+
 foomatic-db (20100806-0ubuntu5) maverick; urgency=low
 
   * debian/control: Added build and runtime dependencies for the PPD archiving
diff --git a/debian/control b/debian/control
index 60809efe..d5e67bec 100644
--- a/debian/control
+++ b/debian/control
@@ -32,20 +32,20 @@ Description: OpenPrinting printer support - database
 Package: openprinting-ppds
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, xz-utils
-Recommends: cups, cups-client
+Recommends: foomatic-filters, cups, cups-client
 Suggests: hpijs-ppds
-Replaces: linuxprinting.org-ppds, hp-ppd (<= 0.5)
+Replaces: openprinting-ppds-extra (<< 20100806-0ubuntu6), linuxprinting.org-ppds, hp-ppd (<= 0.5)
 Breaks: hp-ppd (<= 0.5)
 Provides: linuxprinting.org-ppds
-Conflicts: linuxprinting.org-ppds
+Conflicts: openprinting-ppds-extra (<< 20100806-0ubuntu6), linuxprinting.org-ppds
 Description: OpenPrinting printer support - PostScript PPD files
  This package includes a collection of free PostScript Printer Description
  files for PostScript (and clone) printers from various manufacturers, as
  distributed by OpenPrinting.
  .
  If you have non-PostScript printers, the foomatic-db, foomatic-db-engine,
- hplip, gutenprint or splix packages are the ones you need; this package
- won't be of much help to you.
+ hplip, gutenprint, splix, foo2zjs, pxljr, min12xxw, and m2300w packages are 
+ the ones you need; this package won't be of much help to you.
  .
  Some manufacturers distribute PPD files for their printers under
  non-free licenses; those are not included in this package, but may be
@@ -55,16 +55,8 @@ Description: OpenPrinting printer support - PostScript PPD files
 
 Package: openprinting-ppds-extra
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, xz-utils
-Recommends: foomatic-filters, cups, cups-client
-Replaces: linuxprinting.org-ppds-extra, hp-ppd (<= 0.5), openprinting-ppds (<< 20100529-1)
-Breaks: hp-ppd (<= 0.5), openprinting-ppds (<< 20100529-1)
-Provides: linuxprinting.org-ppds-extra
-Conflicts: linuxprinting.org-ppds-extra 
-Description: OpenPrinting printer support - Extra PostScript PPD files
- This package includes a collection of free PostScript Printer Description
- files for PostScript (and clone) printers from various manufacturers, as
- distributed by OpenPrinting.
- .
- These are additional PostScript printer PPDs for not so common printers,
- especially bigger high-end devices.
+Depends: openprinting-ppds
+Description: Transitional package
+ This dummy package is provided for a smooth transition from the previous
+ openprinting-ppds-extra package (the package's content is merged into
+ openprinting-ppds). It may safely be removed after installation.
diff --git a/debian/openprinting-ppds-extra.install b/debian/openprinting-ppds-extra.install
deleted file mode 100644
index b4bb87a7..00000000
--- a/debian/openprinting-ppds-extra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/share/foomatic/db/source/PPD/Gestetner/* usr/share/ppd/openprinting/Gestetner/
-usr/share/foomatic/db/source/PPD/Infotec/* usr/share/ppd/openprinting/Infotec/
-usr/share/foomatic/db/source/PPD/InfoPrint/* usr/share/ppd/openprinting/InfoPrint/
-usr/share/foomatic/db/source/PPD/Kyocera/de/* usr/share/ppd/openprinting/Kyocera/de/
-usr/share/foomatic/db/source/PPD/Kyocera/es/* usr/share/ppd/openprinting/Kyocera/es/
-usr/share/foomatic/db/source/PPD/Kyocera/fr/* usr/share/ppd/openprinting/Kyocera/fr/
-usr/share/foomatic/db/source/PPD/Kyocera/it/* usr/share/ppd/openprinting/Kyocera/it/
-usr/share/foomatic/db/source/PPD/Kyocera/pt/* usr/share/ppd/openprinting/Kyocera/pt/
-usr/share/foomatic/db/source/PPD/Lanier/* usr/share/ppd/openprinting/Lanier/
-usr/share/foomatic/db/source/PPD/NRG/* usr/share/ppd/openprinting/NRG/
-usr/share/foomatic/db/source/PPD/Ricoh/* usr/share/ppd/openprinting/Ricoh/
-usr/share/foomatic/db/source/PPD/Savin/* usr/share/ppd/openprinting/Savin/
diff --git a/debian/openprinting-ppds-extra.postinst b/debian/openprinting-ppds-extra.postinst
deleted file mode 100644
index f0e3f723..00000000
--- a/debian/openprinting-ppds-extra.postinst
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-# postinst script for openprinting-ppds-extra
-# $Id: $
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-        # Do the following only if CUPS is running and the needed CUPS tools
-        # are available
-	if which lpstat > /dev/null 2>&1 && \
-	    which lpinfo > /dev/null 2>&1 && \
-	    which lpadmin > /dev/null 2>&1 && \
-	    LC_ALL=C lpstat -h /var/run/cups/cups.sock -r | grep -v not > /dev/null 2>&1; then
- 	    # Update the PPD files of all already installed print queues
-	    driverregexp='^openprinting-ppds-extra:'
-	    gennicknameregexp='s/(\s+\d+\.\d+[\d\.]*[ \t]*$|\W*(Ver|RC|v)\W*[\d\.]+[ \t]*)//i; s/\s*,[ \t]*$//'
-	    [ ! -z "$gennicknameregexp" ] && \
-		gennicknameregexp="; $gennicknameregexp"
-	    gennicknameregexp='s/\s*\(recommended\)//'"$gennicknameregexp"
-	    tempfiles=
-	    trap 'rm -f $tempfiles; exit 0' 0 HUP INT QUIT ILL ABRT PIPE TERM
-	    tmpfile1=`mktemp -t updateppds.XXXXXX`
-	    tempfiles="$tempfiles $tmpfile1"
-	    lpinfo -h /var/run/cups/cups.sock -m | grep -E $driverregexp > $tmpfile1
-	    cd /etc/cups/ppd
-	    for ppd in *.ppd; do
-		[ -r "$ppd" ] || continue
-		queue=${ppd%.ppd}
-		lpstat -h /var/run/cups/cups.sock -p "$queue" >/dev/null 2>&1 || continue
-		nickname=`grep '\*NickName:' "$ppd" | cut -d '"' -f 2 | perl -p -e 's/\n$//' | perl -p -e "$gennicknameregexp" | perl -p -e 's/(\W)/\\\\$1/g'`
-		lang=`grep '\*LanguageVersion:' "$ppd" | cut -d ' ' -f 2 | perl -e 'print lc(<>)' | perl -p -e 's/[\r\n]//gs'`
-		ppdfound="0"
-		englishppduri=""
-		tmpfile2=`mktemp -t updateppds.XXXXXX`
-		tempfiles="$tempfiles $tmpfile2"
-		cat $tmpfile1 | perl -p -e "$gennicknameregexp" | grep -E '^\S+\s+.*'"$nickname"'$' | cut -d ' ' -f 1 > $tmpfile2
-		while read newppduri; do
-		    [ "$ppdfound" = "0" ] && lpadmin -h /var/run/cups/cups.sock -p "$queue" -m $newppduri 2>/dev/null || continue
-		    newlang=`grep '\*LanguageVersion:' "$ppd" | cut -d ' ' -f 2 | perl -e 'print lc(<>)' | perl -p -e 's/[\r\n]//gs'`
-		    [ "$newlang" = "$lang" ] && ppdfound="1"
-		    [ "$newlang" = "english" ] && englishppduri="$newppduri"
-		done < $tmpfile2
-		[ "$ppdfound" = "0" ] && [ ! -z "$englishppduri" ] && lpadmin -h /var/run/cups/cups.sock -p "$queue" -m $englishppduri 2>/dev/null && ppdfound="1"
-		[ "$ppdfound" = "1" ] && echo PPD for printer $queue updated >&2
-	    done
-	fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openprinting-ppds.install b/debian/openprinting-ppds.install
index 3b88772c..cec14e0e 100644
--- a/debian/openprinting-ppds.install
+++ b/debian/openprinting-ppds.install
@@ -1,10 +1 @@
-usr/share/foomatic/db/source/PPD/Brother/* usr/share/ppd/openprinting/Brother/
-usr/share/foomatic/db/source/PPD/Epson/* usr/share/ppd/openprinting/Epson/
-usr/share/foomatic/db/source/PPD/HP/* usr/share/ppd/openprinting/HP/
-usr/share/foomatic/db/source/PPD/KONICA_MINOLTA/* usr/share/ppd/openprinting/KONICA_MINOLTA/
-usr/share/foomatic/db/source/PPD/Kyocera/en/* usr/share/ppd/openprinting/Kyocera/en/
-usr/share/foomatic/db/source/PPD/Lexmark/* usr/share/ppd/openprinting/Lexmark/
-usr/share/foomatic/db/source/PPD/Oce/* usr/share/ppd/openprinting/Oce/
-usr/share/foomatic/db/source/PPD/Oki/* usr/share/ppd/openprinting/Oki/
-usr/share/foomatic/db/source/PPD/Sharp/* usr/share/ppd/openprinting/Sharp/
-usr/share/foomatic/db/source/PPD/Toshiba/* usr/share/ppd/openprinting/Toshiba/
+usr/share/foomatic/db/source/PPD/* usr/share/ppd/openprinting/
diff --git a/debian/rules b/debian/rules
index 27d58112..daa9a323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,10 +52,6 @@ override_dh_install:
 	  PYTHONPATH=. bin/pyppd $(CURDIR)/debian/openprinting-ppds/usr/share/ppd/openprinting && \
 	  install -D -m 755 pyppd-ppdfile $(CURDIR)/debian/openprinting-ppds/usr/lib/cups/driver/openprinting-ppds && \
 	  rm -rf $(CURDIR)/debian/openprinting-ppds/usr/share/ppd && \
-	  rm -f pyppd-ppdfile && \
-	  PYTHONPATH=. bin/pyppd $(CURDIR)/debian/openprinting-ppds-extra/usr/share/ppd/openprinting && \
-	  install -D -m 755 pyppd-ppdfile $(CURDIR)/debian/openprinting-ppds-extra/usr/lib/cups/driver/openprinting-ppds-extra && \
-	  rm -rf $(CURDIR)/debian/openprinting-ppds-extra/usr/share/ppd && \
 	  rm -f */*.pyc pyppd-ppdfile \
 	)