Re: [Pkg-hpijs-devel] Bug#649991: Please rename the hplip packages to the printer-driver- convention
Le jeudi, 5 janvier 2012 16.10:33, Till Kamppeter a écrit :
>
> OK, please provide a new patch. Thanks you very much.
Attached. I think I did it mostly right. Maybe we need a Depends onto printer-
driver-postscript-hp, but from which package? (printer-driver-all will in any
case)
Cheers,
OdyX
From 690f1860f6eea2d3ca135676f44ddf6fe51ebb1f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 4 Jan 2012 14:42:48 +0100
Subject: [PATCH] Rename printer packages to the new naming scheme.
- Rename hpijs to printer-driver-hpijs;
- Rename hplip-cups to printer-driver-hpcups;
- Add printer-driver-postscript-hp with PPDs from hplip-data;
- Add transitional packages.
Closes: #649991
Signed-off-by: Didier Raboud <odyx@debian.org>
---
debian/control | 39 ++++++++++++++++++++--
debian/hpijs.README.Debian | 33 -------------------
debian/hpijs.docs | 3 --
debian/hpijs.install | 3 --
debian/hpijs.lintian | 3 --
debian/hpijs.manpages | 1 -
debian/hpijs.ppd-updater | 2 -
debian/hplip-cups.NEWS | 15 ---------
debian/hplip-cups.install | 3 --
debian/hplip-cups.lintian | 3 --
debian/hplip-cups.ppd-updater | 2 -
debian/hplip-data.install | 1 -
debian/hplip.install | 1 -
debian/hplip.ppd-updater | 2 -
debian/printer-driver-hpcups.NEWS | 15 +++++++++
debian/printer-driver-hpcups.install | 3 ++
debian/printer-driver-hpcups.lintian | 3 ++
debian/printer-driver-hpcups.ppd-updater | 2 +
debian/printer-driver-hpijs.README.Debian | 33 +++++++++++++++++++
debian/printer-driver-hpijs.docs | 3 ++
debian/printer-driver-hpijs.install | 3 ++
debian/printer-driver-hpijs.lintian | 3 ++
debian/printer-driver-hpijs.manpages | 1 +
debian/printer-driver-hpijs.ppd-updater | 2 +
debian/printer-driver-postscript-hp.install | 2 +
debian/printer-driver-postscript-hp.ppd-updater | 2 +
debian/rules | 21 ++++++------
27 files changed, 117 insertions(+), 87 deletions(-)
delete mode 100644 debian/hpijs.README.Debian
delete mode 100644 debian/hpijs.docs
delete mode 100644 debian/hpijs.install
delete mode 100644 debian/hpijs.lintian
delete mode 100644 debian/hpijs.manpages
delete mode 100644 debian/hpijs.ppd-updater
delete mode 100644 debian/hplip-cups.NEWS
delete mode 100644 debian/hplip-cups.install
delete mode 100644 debian/hplip-cups.lintian
delete mode 100644 debian/hplip-cups.ppd-updater
delete mode 100644 debian/hplip.ppd-updater
create mode 100644 debian/printer-driver-hpcups.NEWS
create mode 100644 debian/printer-driver-hpcups.install
create mode 100644 debian/printer-driver-hpcups.lintian
create mode 100644 debian/printer-driver-hpcups.ppd-updater
create mode 100644 debian/printer-driver-hpijs.README.Debian
create mode 100644 debian/printer-driver-hpijs.docs
create mode 100644 debian/printer-driver-hpijs.install
create mode 100644 debian/printer-driver-hpijs.lintian
create mode 100644 debian/printer-driver-hpijs.manpages
create mode 100644 debian/printer-driver-hpijs.ppd-updater
create mode 100644 debian/printer-driver-postscript-hp.install
create mode 100644 debian/printer-driver-postscript-hp.ppd-updater
diff --git a/debian/control b/debian/control
index d2e7457..ad5c710 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Package: hplip
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libsane-hpaio (= ${hplip:binary:Version}),
libhpmud0 (= ${hplip:binary:Version}), hplip-data (= ${hplip:source:Version}),
- hplip-cups (= ${hplip:binary:Version}),
+ printer-driver-hpcups (= ${hplip:binary:Version}),
${python:Depends}, python-dbus (>= 0.80), python-imaging, python-pexpect,
coreutils (>= 5.1.0), lsb-base (>= 3), adduser (>= 3.34), cups (>= 1.1.20),
policykit-1, wget
@@ -65,6 +65,16 @@ Description: HP Linux Printing and Imaging - data files
This package contains data files and PPDs for the HP Linux Printing and
Imaging System.
+Package: printer-driver-postscript-hp
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: hplip (>= ${hplip:source:Version})
+Replaces: hplip-data (<< 3.11.10-1.1), hplip (<< 3.11.10-1.1)
+Breaks: cups (<< 1.5.0-11~)
+Description: HP Printers PostScript Descriptions
+ This package contains the compressed PPDs for the PostScript HP
+ Printers.
+
Package: hplip-gui
Architecture: all
Depends: ${misc:Depends}, hplip (>= ${hplip:source:Version}), dbus-x11,
@@ -83,7 +93,7 @@ Package: hplip-dbg
Architecture: any
Priority: extra
Section: debug
-Depends: ${misc:Depends}, hplip (= ${hplip:binary:Version}) | hplip-cups (= ${hplip:binary:Version}) | hpijs (= ${hpijs:binary:Version})
+Depends: ${misc:Depends}, hplip (= ${hplip:binary:Version}) | printer-driver-hpcups (= ${hplip:binary:Version}) | printer-driver-hpijs (= ${hpijs:binary:Version})
Conflicts: hplip (<< 3.10.2-2ubuntu2)
Description: HP Linux Printing and Imaging - debugging information
This package contains debugging symbolic information for all the
@@ -108,7 +118,7 @@ Section: utils
Provides: hplip-ppds
Replaces: hplip-ppds
Conflicts: hplip-ppds, foomatic-filters-ppds (>> 20000101)
-Depends: ${misc:Depends}, hpijs (>= ${hpijs:source:Version}), foomatic-filters (>= 3.0.2)
+Depends: ${misc:Depends}, printer-driver-hpijs (>= ${hpijs:source:Version}), foomatic-filters (>= 3.0.2)
Description: HP Linux Printing and Imaging - HPIJS PPD files
This package contains PPD (printer definition) files for the
printers supported through the HP Linux Printing and Imaging
@@ -120,12 +130,22 @@ Description: HP Linux Printing and Imaging - HPIJS PPD files
version of the PPDs (which are not guaranteed to work well).
Package: hpijs
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: printer-driver-hpijs
+Description: transitional dummy package for hpijs printer driver
+ This is a transitional dummy package to transition to uniformly named
+ printer-driver-hpijs.
+
+Package: printer-driver-hpijs
Architecture: any
Section: text
Depends: ${shlibs:Depends}, ${misc:Depends}, libhpmud0 (= ${hplip:binary:Version})
Recommends: ghostscript, cups (>= 1.4.0) | cupsddk | hpijs-ppds, foomatic-filters
Suggests: hplip, hpijs-ppds, hplip-doc
-Replaces: hpijs-ppds (<< 2.6.10+1.6.10-1), hplip-ppds (<< 1.6.10-1)
+Replaces: hpijs-ppds (<< 2.6.10+1.6.10-1), hplip-ppds (<< 1.6.10-1), hpijs (<< 3.11.10-1.1)
+Breaks: hpijs (<< 3.11.10-1.1)
Description: HP Linux Printing and Imaging - gs IJS driver (hpijs)
This package contains an IJS printer driver for Ghostscript, which
adds support for most inkjet printers and some LaserJet printers
@@ -150,11 +170,22 @@ Description: HP Linux Printing and Imaging - gs IJS driver (hpijs)
foomatic-filters package).
Package: hplip-cups
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: printer-driver-hpcups
+Description: transitional dummy package for hpcups printer driver
+ This is a transitional dummy package to transition to uniformly named
+ printer-driver-hpcups.
+
+Package: printer-driver-hpcups
Architecture: any
Section: text
Depends: ${shlibs:Depends}, ${misc:Depends},
ghostscript-cups, cups (>= 1.4.0) | cupsddk, cups
Suggests: hplip-doc, hplip (= ${hplip:binary:Version})
+Replaces: hplip-cups (<< 3.11.10-1.1)
+Breaks: hplip-cups (<< 3.11.10-1.1)
Description: HP Linux Printing and Imaging - CUPS Raster driver (hpcups)
This package contains a CUPS-Raster-based printer driver which adds support
for most inkjet printers and some LaserJet printers manufactured by HP. It
diff --git a/debian/hpijs.README.Debian b/debian/hpijs.README.Debian
deleted file mode 100644
index 834055d..0000000
--- a/debian/hpijs.README.Debian
+++ /dev/null
@@ -1,33 +0,0 @@
-Notes about the Debian hpijs package
-------------------------------------
-
-This package includes the rss patch from
-
- http://www.openprinting.org/download/printing/hpijs/
-
-This patch tries to make sure that black is printed with just
-the black pen, if the printer supports it. Almost all new
-HP printers (those using the DJGenericVIP model) do colormap
-conversion in firmware, and will completely ignore the rss
-patch. Also, nobody has maintained that patch for a long time,
-so it is unlikely that rss support will be ever added to newer
-printer drivers even if they could support it.
-
-Should Ghostscript have the latest version of the IJS server
-code, hpijs will be able to use the KRGB protocol to talk to
-Ghostscript, which often will produce better printings wherever
-black is used.
-
-It is a very good idea to install the hplip package if you
-use CUPS as your printing spooler. For spoolers other than
-CUPS, you should use hpoj instead.
-
-A lot of enhanced functionality is only available in bi-dir
-mode, which is supported only by HPLIP.
-
-If you are going to use PPDs, it is recommended that the ones
-from the hpijs-ppds PPD package be used, as they are guaranteed
-to work well with this version of hpijs.
-
- -- Torsten Landschoff <torsten@debian.org>
- -- Henrique de Moraes Holschuh <hmh@debian.org>
diff --git a/debian/hpijs.docs b/debian/hpijs.docs
deleted file mode 100644
index 04b5b22..0000000
--- a/debian/hpijs.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-prnt/hpijs/*patch
-debian/gdevijs*patch
-debian/users-guide.txt
diff --git a/debian/hpijs.install b/debian/hpijs.install
deleted file mode 100644
index 0718f00..0000000
--- a/debian/hpijs.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/hpijs usr/bin/
-usr/share/cups/drv/hpijs.drv usr/share/cups/drv/
-usr/share/cups/ppd-updaters/hpijs
diff --git a/debian/hpijs.lintian b/debian/hpijs.lintian
deleted file mode 100644
index aada476..0000000
--- a/debian/hpijs.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# dependency on libcrypto.so.0.9.8 could be avoided if were not uselessly linked against it (they use none of its symbols)
-# pulled in via libsnmp-dev :-(
-possible-gpl-code-linked-with-openssl
diff --git a/debian/hpijs.manpages b/debian/hpijs.manpages
deleted file mode 100644
index de6c729..0000000
--- a/debian/hpijs.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/hpijs.1
diff --git a/debian/hpijs.ppd-updater b/debian/hpijs.ppd-updater
deleted file mode 100644
index 1a531b9..0000000
--- a/debian/hpijs.ppd-updater
+++ /dev/null
@@ -1,2 +0,0 @@
-DRIVER_REGEXP='drv:///hpijs.drv/|lsb/usr/hplip/HP/HP-Fax.*-hpijs'
-GENNICKNAME_REGEXP='s/,?\s+(zjs|zxs|pcl3|Series|requires\s+proprietary\s+plugin)//gi; s/,?(\s*hpijs,?|,)\s*[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpijs)(\s*\S+|)$//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+)Premium/$1Prem/i; s/[,\s\n]+$//'
diff --git a/debian/hplip-cups.NEWS b/debian/hplip-cups.NEWS
deleted file mode 100644
index 76c00ff..0000000
--- a/debian/hplip-cups.NEWS
+++ /dev/null
@@ -1,15 +0,0 @@
-hplip-cups (3.10.2-1) unstable; urgency=low
-
- * Please note that you need to be a member of the group lpadmin
- perform any admistrative function on printers (See Bug #566692)
- - /usr/share/doc/cups/README.txt.gz
-
- -- Mark Purcell <msp@debian.org> Tue, 06 Apr 2010 18:18:20 +1000
-
-hplip-cups (3.9.2-2) unstable; urgency=low
-
- Access to the full functionality of hplip; ink check, toolbox,
- printing and scanning is now provided for members of the 'lp'
- group. The use of the scanner group is depreciated.
-
- -- Mark Purcell <msp@debian.org> Sun, 15 Mar 2009 22:09:23 +1100
diff --git a/debian/hplip-cups.install b/debian/hplip-cups.install
deleted file mode 100644
index 4085a5f..0000000
--- a/debian/hplip-cups.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/cups/filter/hpcups*
-usr/share/cups/drv/hpcups.drv
-usr/share/cups/ppd-updaters/hplip-cups
diff --git a/debian/hplip-cups.lintian b/debian/hplip-cups.lintian
deleted file mode 100644
index aada476..0000000
--- a/debian/hplip-cups.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# dependency on libcrypto.so.0.9.8 could be avoided if were not uselessly linked against it (they use none of its symbols)
-# pulled in via libsnmp-dev :-(
-possible-gpl-code-linked-with-openssl
diff --git a/debian/hplip-cups.ppd-updater b/debian/hplip-cups.ppd-updater
deleted file mode 100644
index a742508..0000000
--- a/debian/hplip-cups.ppd-updater
+++ /dev/null
@@ -1,2 +0,0 @@
-DRIVER_REGEXP='drv:///hpcups.drv/|lsb/usr/hplip/HP/HP-Fax.*-hpcups'
-GENNICKNAME_REGEXP='s/,?\s+(zjs|zxs|pcl3|Series|requires\s+proprietary\s+plugin)//gi; 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/(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+)Premium/$1Prem/i; s/[,\s\n]+$//'
diff --git a/debian/hplip-data.install b/debian/hplip-data.install
index a0b6e2e..0ae7395 100644
--- a/debian/hplip-data.install
+++ b/debian/hplip-data.install
@@ -1,3 +1,2 @@
/usr/share/hplip
/usr/share/apport/package-hooks/source_hplip.py
-/usr/share/ppd/hplip/*/*ps.ppd*
diff --git a/debian/hplip.install b/debian/hplip.install
index 8a4abd3..7e7a849 100644
--- a/debian/hplip.install
+++ b/debian/hplip.install
@@ -27,7 +27,6 @@ usr/lib/cups/filter/hpcac
usr/lib/python*
usr/share/cups/mime/*.types
usr/share/cups/mime/*.convs
-usr/share/cups/ppd-updaters/hplip
usr/share/dbus-1
usr/share/polkit-1
var/lib
diff --git a/debian/hplip.ppd-updater b/debian/hplip.ppd-updater
deleted file mode 100644
index 7a3140c..0000000
--- a/debian/hplip.ppd-updater
+++ /dev/null
@@ -1,2 +0,0 @@
-DRIVER_REGEXP='^hplip:'
-GENNICKNAME_REGEXP='s/\s*(v\d+\.\d+|(Ver|-\s*RC)\s*[\d\.]+)//'
diff --git a/debian/printer-driver-hpcups.NEWS b/debian/printer-driver-hpcups.NEWS
new file mode 100644
index 0000000..76c00ff
--- /dev/null
+++ b/debian/printer-driver-hpcups.NEWS
@@ -0,0 +1,15 @@
+hplip-cups (3.10.2-1) unstable; urgency=low
+
+ * Please note that you need to be a member of the group lpadmin
+ perform any admistrative function on printers (See Bug #566692)
+ - /usr/share/doc/cups/README.txt.gz
+
+ -- Mark Purcell <msp@debian.org> Tue, 06 Apr 2010 18:18:20 +1000
+
+hplip-cups (3.9.2-2) unstable; urgency=low
+
+ Access to the full functionality of hplip; ink check, toolbox,
+ printing and scanning is now provided for members of the 'lp'
+ group. The use of the scanner group is depreciated.
+
+ -- Mark Purcell <msp@debian.org> Sun, 15 Mar 2009 22:09:23 +1100
diff --git a/debian/printer-driver-hpcups.install b/debian/printer-driver-hpcups.install
new file mode 100644
index 0000000..dd3e779
--- /dev/null
+++ b/debian/printer-driver-hpcups.install
@@ -0,0 +1,3 @@
+usr/lib/cups/filter/hpcups*
+usr/share/cups/drv/hpcups.drv
+usr/share/cups/ppd-updaters/printer-driver-hpcups
diff --git a/debian/printer-driver-hpcups.lintian b/debian/printer-driver-hpcups.lintian
new file mode 100644
index 0000000..aada476
--- /dev/null
+++ b/debian/printer-driver-hpcups.lintian
@@ -0,0 +1,3 @@
+# dependency on libcrypto.so.0.9.8 could be avoided if were not uselessly linked against it (they use none of its symbols)
+# pulled in via libsnmp-dev :-(
+possible-gpl-code-linked-with-openssl
diff --git a/debian/printer-driver-hpcups.ppd-updater b/debian/printer-driver-hpcups.ppd-updater
new file mode 100644
index 0000000..a742508
--- /dev/null
+++ b/debian/printer-driver-hpcups.ppd-updater
@@ -0,0 +1,2 @@
+DRIVER_REGEXP='drv:///hpcups.drv/|lsb/usr/hplip/HP/HP-Fax.*-hpcups'
+GENNICKNAME_REGEXP='s/,?\s+(zjs|zxs|pcl3|Series|requires\s+proprietary\s+plugin)//gi; 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/(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+)Premium/$1Prem/i; s/[,\s\n]+$//'
diff --git a/debian/printer-driver-hpijs.README.Debian b/debian/printer-driver-hpijs.README.Debian
new file mode 100644
index 0000000..834055d
--- /dev/null
+++ b/debian/printer-driver-hpijs.README.Debian
@@ -0,0 +1,33 @@
+Notes about the Debian hpijs package
+------------------------------------
+
+This package includes the rss patch from
+
+ http://www.openprinting.org/download/printing/hpijs/
+
+This patch tries to make sure that black is printed with just
+the black pen, if the printer supports it. Almost all new
+HP printers (those using the DJGenericVIP model) do colormap
+conversion in firmware, and will completely ignore the rss
+patch. Also, nobody has maintained that patch for a long time,
+so it is unlikely that rss support will be ever added to newer
+printer drivers even if they could support it.
+
+Should Ghostscript have the latest version of the IJS server
+code, hpijs will be able to use the KRGB protocol to talk to
+Ghostscript, which often will produce better printings wherever
+black is used.
+
+It is a very good idea to install the hplip package if you
+use CUPS as your printing spooler. For spoolers other than
+CUPS, you should use hpoj instead.
+
+A lot of enhanced functionality is only available in bi-dir
+mode, which is supported only by HPLIP.
+
+If you are going to use PPDs, it is recommended that the ones
+from the hpijs-ppds PPD package be used, as they are guaranteed
+to work well with this version of hpijs.
+
+ -- Torsten Landschoff <torsten@debian.org>
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
diff --git a/debian/printer-driver-hpijs.docs b/debian/printer-driver-hpijs.docs
new file mode 100644
index 0000000..04b5b22
--- /dev/null
+++ b/debian/printer-driver-hpijs.docs
@@ -0,0 +1,3 @@
+prnt/hpijs/*patch
+debian/gdevijs*patch
+debian/users-guide.txt
diff --git a/debian/printer-driver-hpijs.install b/debian/printer-driver-hpijs.install
new file mode 100644
index 0000000..4db1069
--- /dev/null
+++ b/debian/printer-driver-hpijs.install
@@ -0,0 +1,3 @@
+usr/bin/hpijs usr/bin/
+usr/share/cups/drv/hpijs.drv usr/share/cups/drv/
+usr/share/cups/ppd-updaters/printer-driver-hpijs
diff --git a/debian/printer-driver-hpijs.lintian b/debian/printer-driver-hpijs.lintian
new file mode 100644
index 0000000..aada476
--- /dev/null
+++ b/debian/printer-driver-hpijs.lintian
@@ -0,0 +1,3 @@
+# dependency on libcrypto.so.0.9.8 could be avoided if were not uselessly linked against it (they use none of its symbols)
+# pulled in via libsnmp-dev :-(
+possible-gpl-code-linked-with-openssl
diff --git a/debian/printer-driver-hpijs.manpages b/debian/printer-driver-hpijs.manpages
new file mode 100644
index 0000000..de6c729
--- /dev/null
+++ b/debian/printer-driver-hpijs.manpages
@@ -0,0 +1 @@
+debian/hpijs.1
diff --git a/debian/printer-driver-hpijs.ppd-updater b/debian/printer-driver-hpijs.ppd-updater
new file mode 100644
index 0000000..1a531b9
--- /dev/null
+++ b/debian/printer-driver-hpijs.ppd-updater
@@ -0,0 +1,2 @@
+DRIVER_REGEXP='drv:///hpijs.drv/|lsb/usr/hplip/HP/HP-Fax.*-hpijs'
+GENNICKNAME_REGEXP='s/,?\s+(zjs|zxs|pcl3|Series|requires\s+proprietary\s+plugin)//gi; s/,?(\s*hpijs,?|,)\s*[\d\.]+[a-zA-Z]*[\d\.]*\s*$//; s/\s*(Foomatic\/|)(hpijs)(\s*\S+|)$//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+)Premium/$1Prem/i; s/[,\s\n]+$//'
diff --git a/debian/printer-driver-postscript-hp.install b/debian/printer-driver-postscript-hp.install
new file mode 100644
index 0000000..b6ff11c
--- /dev/null
+++ b/debian/printer-driver-postscript-hp.install
@@ -0,0 +1,2 @@
+usr/share/ppd/hplip/*/*ps.ppd*
+usr/share/cups/ppd-updaters/printer-driver-postscript-hp
diff --git a/debian/printer-driver-postscript-hp.ppd-updater b/debian/printer-driver-postscript-hp.ppd-updater
new file mode 100644
index 0000000..ad6f49f
--- /dev/null
+++ b/debian/printer-driver-postscript-hp.ppd-updater
@@ -0,0 +1,2 @@
+DRIVER_REGEXP='^printer-driver-postscript-hp:'
+GENNICKNAME_REGEXP='s/\s*(v\d+\.\d+|(Ver|-\s*RC)\s*[\d\.]+)//'
diff --git a/debian/rules b/debian/rules
index 79f5a04..afc2484 100755
--- a/debian/rules
+++ b/debian/rules
@@ -199,9 +199,9 @@ install-stamp: build-stamp
# Install the ppd updater data files so that CUPS can update the
# PPDs of the already existing queue after each update of HPLIP's
# printer driver/PPD packages
- install -D -m 644 debian/hplip.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/hplip
- install -D -m 644 debian/hplip-cups.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/hplip-cups
- install -D -m 644 debian/hpijs.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/hpijs
+ install -D -m 644 debian/printer-driver-postscript-hp.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/printer-driver-postscript-hp
+ install -D -m 644 debian/printer-driver-hpcups.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/printer-driver-hpcups
+ install -D -m 644 debian/printer-driver-hpijs.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/printer-driver-hpijs
install -D -m 644 debian/hpijs-ppds.ppd-updater $(PKGTMP)/usr/share/cups/ppd-updaters/hpijs-ppds
# Install Apport hook
@@ -299,16 +299,16 @@ install-arch-stamp: install-stamp
install -m 755 hplipjs "$(PKGTMP)/usr/lib/cups/filter/"
# Fax PPDs, install to destdir directly
- mkdir -p "$(CURDIR)/debian/hpijs/usr/share/ppd/hplip/HP"
- mkdir -p "$(CURDIR)/debian/hplip-cups/usr/share/ppd/hplip/HP"
+ mkdir -p "$(CURDIR)/debian/printer-driver-hpijs/usr/share/ppd/hplip/HP"
+ mkdir -p "$(CURDIR)/debian/printer-driver-hpcups/usr/share/ppd/hplip/HP"
cp fax/ppd/HP-Fax*-hpijs.ppd.gz \
- "$(CURDIR)/debian/hpijs/usr/share/ppd/hplip/HP/"
+ "$(CURDIR)/debian/printer-driver-hpijs/usr/share/ppd/hplip/HP/"
cp fax/ppd/HP-Fax*-hpcups.ppd.gz \
- "$(CURDIR)/debian/hplip-cups/usr/share/ppd/hplip/HP/"
+ "$(CURDIR)/debian/printer-driver-hpcups/usr/share/ppd/hplip/HP/"
# Uncompress PPDs, this makes the package smaller for distribution
- -find "$(CURDIR)/debian/hpijs/usr/share/ppd/" -name '*.ppd.gz' | xargs gunzip -f
- -find "$(CURDIR)/debian/hplip-cups/usr/share/ppd/" -name '*.ppd.gz' | xargs gunzip -f
+ -find "$(CURDIR)/debian/printer-driver-hpijs/usr/share/ppd/" -name '*.ppd.gz' | xargs gunzip -f
+ -find "$(CURDIR)/debian/printer-driver-hpcups/usr/share/ppd/" -name '*.ppd.gz' | xargs gunzip -f
# Modify all Ghostscript command lines to have the "-dNOINTERPOLATE"
# coomand line option. This makes rendering the pages much faster
@@ -346,8 +346,7 @@ install-indep-stamp: install-stamp install-arch-stamp
)
# Compress the PPD files with pyppd
- dh_pyppd -phplip-data
- mv $(CURDIR)/debian/hplip-data/usr/lib/cups/driver/hplip-data $(CURDIR)/debian/hplip-data/usr/lib/cups/driver/hplip
+ dh_pyppd -pprinter-driver-postscript-hp
# Remove models.dat from hplip-data - we ship with libsane-hpaio
rm $(CURDIR)/debian/hplip-data/usr/share/hplip/data/models/models.dat
--
1.7.2.5
Reply to: