diff -u hplip-3.10.6/debian/control hplip-3.10.6/debian/control --- hplip-3.10.6/debian/control +++ hplip-3.10.6/debian/control @@ -19,7 +19,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libsane-hpaio (= ${hplip:source:Version}), libhpmud0 (= ${hplip:binary:Version}), hplip-data (= ${hplip:source:Version}), - hplip-cups (= ${hplip:binary:Version}), + hpijs (= ${hplip:binary:Version}), python (>> 2.6), python (<< 2.7), ${python:Depends}, python-dbus (>= 0.80), python-imaging, python-pexpect, coreutils (>= 5.1.0), lsb-base (>= 3), adduser (>= 3.34), cups (>= 1.1.20), cups-client (>= 1.1.20), diff -u hplip-3.10.6/debian/hpijs.postinst hplip-3.10.6/debian/hpijs.postinst --- hplip-3.10.6/debian/hpijs.postinst +++ hplip-3.10.6/debian/hpijs.postinst @@ -34,7 +34,7 @@ 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='drv:///hpijs.drv/|lsb/usr/hplip/HP/HP-Fax.*-hpijs' - gennicknameregexp='s/,?(\s*hpijs,?|,)\s*[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpijs)(\s*\S+|)$//i; s/\s*Series$//i; s/(HP\s+)PhotoSmart(\s+)/\1PS\2/i; s/(HP\s+)DeskJet(\s+)/\1DJ\2/i; s/(HP\s+)Color\s*(LaserJet|LJ)(\s+)/\1CLJ\3/i; s/(HP\s+)LaserJet(\s+)/\1LJ\2/i; s/(HP\s+)OfficeJet(\s+)/\1OJ\2/i; s/(HP\s+)Business\s*InkJet(\s+)/\1BIJ\2/i; s/(HP\s+)DesignJet(\s+)/\1DESIGNJ\2/i; s/(HP\s+)Printer\s*Scanner\s*Copier(\s+)/\1PSC\2/i; s/(HP\s+)Color\s*InkJet\s*Printer\s+/\1/i; s/\s+(zjs|zxs|pcl3)//i' + gennicknameregexp='s/,?\s*hpcups,?\s+[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpcups)(\s*\S+|)$//i; s/,?(\s*hpijs,?|,)\s*[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpijs)(\s*\S+|)$//i; s/\s*Series$//i; s/(HP\s+)PhotoSmart(\s+)/\1PS\2/i; s/(HP\s+)DeskJet(\s+)/\1DJ\2/i; s/(HP\s+)Color\s*(LaserJet|LJ)(\s+)/\1CLJ\3/i; s/(HP\s+)LaserJet(\s+)/\1LJ\2/i; s/(HP\s+)OfficeJet(\s+)/\1OJ\2/i; s/(HP\s+)Business\s*InkJet(\s+)/\1BIJ\2/i; s/(HP\s+)DesignJet(\s+)/\1DESIGNJ\2/i; s/(HP\s+)Printer\s*Scanner\s*Copier(\s+)/\1PSC\2/i; s/(HP\s+)Color\s*InkJet\s*Printer\s+/\1/i; s/\s+(zjs|zxs|pcl3)//i' [ ! -z "$gennicknameregexp" ] && \ gennicknameregexp="; $gennicknameregexp" gennicknameregexp='s/\s*\(recommended[^\)]*\)//'"$gennicknameregexp" diff -u hplip-3.10.6/debian/changelog hplip-3.10.6/debian/changelog --- hplip-3.10.6/debian/changelog +++ hplip-3.10.6/debian/changelog @@ -1,3 +1,13 @@ +hplip (3.10.6-1ubuntu10.1) maverick-proposed; urgency=low + + * debian/hplip-cups.postinst, debian/hpijs.postinst: Switch back to HPIJS as + default driver (migrate hpcups queues to HPIJS) as there are still problems + with hpcups and duplex printing (LP: #428588, LP: #487695, LP: #657357). + * debian/control: Let hplip depend on hpijs instead of on hplip-cups as + printer driver. + + -- Till Kamppeter Thu, 21 Oct 2010 14:35:03 +0200 + hplip (3.10.6-1ubuntu10) maverick; urgency=low * debian/local/pyppd/pyppd/: Updated to pyppd 0.4.9, to suppress runtime diff -u hplip-3.10.6/debian/hplip-cups.postinst hplip-3.10.6/debian/hplip-cups.postinst --- hplip-3.10.6/debian/hplip-cups.postinst +++ hplip-3.10.6/debian/hplip-cups.postinst @@ -34,7 +34,7 @@ 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='drv:///hpcups.drv/|lsb/usr/hplip/HP/HP-Fax.*-hpcups' - gennicknameregexp=' s/,?(\s*hpijs,?|,)\s*[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpijs)(\s*\S+|)$//i; s/,?\s*hpcups,?\s+[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpcups)(\s*\S+|)$//i; s/\s*Series$//i; s/(HP\s+)PhotoSmart(\s+)/\1PS\2/i; s/(HP\s+)DeskJet(\s+)/\1DJ\2/i; s/(HP\s+)Color\s*(LaserJet|LJ)(\s+)/\1CLJ\3/i; s/(HP\s+)LaserJet(\s+)/\1LJ\2/i; s/(HP\s+)OfficeJet(\s+)/\1OJ\2/i; s/(HP\s+)Business\s*InkJet(\s+)/\1BIJ\2/i; s/(HP\s+)DesignJet(\s+)/\1DESIGNJ\2/i; s/(HP\s+)Printer\s*Scanner\s*Copier(\s+)/\1PSC\2/i; s/(HP\s+)Color\s*InkJet\s*Printer\s+/\1/i; s/\s+(zjs|zxs|pcl3)//i' + gennicknameregexp='s/,?\s*hpcups,?\s+[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpcups)(\s*\S+|)$//i; s/\s*Series$//i; s/(HP\s+)PhotoSmart(\s+)/\1PS\2/i; s/(HP\s+)DeskJet(\s+)/\1DJ\2/i; s/(HP\s+)Color\s*(LaserJet|LJ)(\s+)/\1CLJ\3/i; s/(HP\s+)LaserJet(\s+)/\1LJ\2/i; s/(HP\s+)OfficeJet(\s+)/\1OJ\2/i; s/(HP\s+)Business\s*InkJet(\s+)/\1BIJ\2/i; s/(HP\s+)DesignJet(\s+)/\1DESIGNJ\2/i; s/(HP\s+)Printer\s*Scanner\s*Copier(\s+)/\1PSC\2/i; s/(HP\s+)Color\s*InkJet\s*Printer\s+/\1/i; s/\s+(zjs|zxs|pcl3)//i' [ ! -z "$gennicknameregexp" ] && \ gennicknameregexp="; $gennicknameregexp" gennicknameregexp='s/\s*\(recommended\)//'"$gennicknameregexp"