From e3e25b211de80d8dff8a991cf6340e7da2de7e9c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:04:55 +0000 Subject: [PATCH 01/69] Initialize branch F-12 for hplip --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 8e28854e2db05783667144d19d70bf9c02624960 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 29 Sep 2009 15:34:58 +0000 Subject: [PATCH 02/69] - Give up trying to print a job to a reconnected device (bug #515481). --- hplip-device-reconnected.patch | 35 ++++++++++++++++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 hplip-device-reconnected.patch diff --git a/hplip-device-reconnected.patch b/hplip-device-reconnected.patch new file mode 100644 index 0000000..ccb7fa9 --- /dev/null +++ b/hplip-device-reconnected.patch @@ -0,0 +1,35 @@ +diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c +--- hplip-3.9.8/prnt/backend/hp.c.device-reconnected 2009-09-29 16:02:14.717467334 +0100 ++++ hplip-3.9.8/prnt/backend/hp.c 2009-09-29 16:02:20.019342096 +0100 +@@ -638,6 +638,7 @@ int main(int argc, char *argv[]) + HPMUD_DEVICE hd=-1; + HPMUD_CHANNEL cd=-1; + int n, total=0, retry=0, size, pages; ++ int consecutive_failures=0; + enum HPMUD_RESULT stat; + char *printer = getenv("PRINTER"); + +@@ -789,10 +790,23 @@ int main(int argc, char *argv[]) + /* IO error, get printer status. */ + if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3])) + goto bugout; ++ ++ if (++consecutive_failures == 5) ++ { ++ /* hpmud_write_channel has failed several times in ++ * succession but the Device ID-based status says ++ * the printer is happy. Time to face the fact that ++ * the device has probably reconnected, and our USB ++ * channel is invalidated. */ ++ ++ BUG("ERROR: device reconnected?"); ++ goto bugout; ++ } + } + else + { + /* Data was sent to device successfully. */ ++ consecutive_failures = 0; + if (pa.pjl_device) + { + /* Laserjets have a large data buffer, so manually check for operator intervention condition. */ diff --git a/hplip.spec b/hplip.spec index 787541c..504174f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -23,6 +23,7 @@ Patch7: hplip-parenths.patch Patch8: hplip-non-scripts.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch +Patch11: hplip-device-reconnected.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method +# Give up trying to print a job to a reconnected device (bug #515481). +%patch11 -p1 -b .device-reconnected + %build aclocal automake --foreign --add-missing --copy @@ -345,6 +349,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Tue Sep 29 2009 Tim Waugh 3.9.8-17 +- Give up trying to print a job to a reconnected device (bug #515481). + * Wed Sep 23 2009 Tim Waugh 3.9.8-16 - Enable parallel port support when configuring (bug #524979). From aface26918ffc81d106db6fd50549c8f2dad8b93 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 28 Oct 2009 17:44:24 +0000 Subject: [PATCH 03/69] - Set a printer-state-reason when there's a missing required plugin (bug #531330). --- hplip-plugin-error.patch | 23 +++++++++++++++++++++++ hplip.spec | 8 +++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 hplip-plugin-error.patch diff --git a/hplip-plugin-error.patch b/hplip-plugin-error.patch new file mode 100644 index 0000000..ec4c541 --- /dev/null +++ b/hplip-plugin-error.patch @@ -0,0 +1,23 @@ +diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c +--- hplip-3.9.8/prnt/backend/hp.c~ 2009-10-28 17:03:27.435140391 +0000 ++++ hplip-3.9.8/prnt/backend/hp.c 2009-10-28 17:12:15.709140073 +0000 +@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP + if (first_time) + { + first_time = 0; +- old_state = ("media-empty-error,media-jam-error," ++ old_state = ("media-empty-error,media-jam-error,hplip.plugin-error," + "cover-open-error,toner-empty-error,other"); + } + +diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp +--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~ 2009-10-28 17:03:27.390139541 +0000 ++++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-10-28 17:11:18.980140742 +0000 +@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv) + SendDbusMessage (device_uri, printer, + EVENT_PRINT_FAILED_MISSING_PLUGIN, + argv[2], atoi (argv[1]), argv[3]); ++ fputs ("STATE: +hplip.plugin-error\n", stderr); + BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err); + return 1; + } diff --git a/hplip.spec b/hplip.spec index 504174f..2678d7d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,6 +24,7 @@ Patch8: hplip-non-scripts.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch +Patch12: hplip-plugin-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected +%patch12 -p1 -b .plugin-error %build aclocal @@ -349,6 +351,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Wed Oct 28 2009 Tim Waugh 3.9.8-18 +- Set a printer-state-reason when there's a missing required plugin + (bug #531330). + * Tue Sep 29 2009 Tim Waugh 3.9.8-17 - Give up trying to print a job to a reconnected device (bug #515481). From 70df7a97a566ae030b2d66dc9f7d0ce6daf48eae Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 29 Oct 2009 10:53:33 +0000 Subject: [PATCH 04/69] Explain what patch12 is for in comments. --- hplip.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hplip.spec b/hplip.spec index 2678d7d..bc43bd9 100644 --- a/hplip.spec +++ b/hplip.spec @@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected + +# Set a printer-state-reason when there's a missing required plugin +# (bug #531330). %patch12 -p1 -b .plugin-error %build From 2bba0f0772ed883d976f5c079de75f2219bfaf36 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 29 Oct 2009 12:24:42 +0000 Subject: [PATCH 05/69] - Avoid busy loop in hpcups when backend has exited (bug #525944). --- hplip-hpcups-sigpipe.patch | 29 +++++++++++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 hplip-hpcups-sigpipe.patch diff --git a/hplip-hpcups-sigpipe.patch b/hplip-hpcups-sigpipe.patch new file mode 100644 index 0000000..3dbe0b0 --- /dev/null +++ b/hplip-hpcups-sigpipe.patch @@ -0,0 +1,29 @@ +diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpijs/services.cpp +--- hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe 2009-08-04 22:35:41.000000000 +0100 ++++ hplip-3.9.8/prnt/hpijs/services.cpp 2009-10-29 11:56:23.015022337 +0000 +@@ -29,6 +29,7 @@ + POSSIBILITY OF SUCH DAMAGE. + \*****************************************************************************/ + ++#include + #include + #include + #include +@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const + if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) + { + static int cnt=0; +- if (cnt++ < 5) ++ if (cnt < 5) ++ { ++ cnt++; + BUG("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count); ++ } ++ ++ if (errno == EPIPE) ++ /* The backend has exited. There's no recovering from that. */ ++ exit (1); ++ + return IO_ERROR; + } + diff --git a/hplip.spec b/hplip.spec index bc43bd9..0285541 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -25,6 +25,7 @@ Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-plugin-error.patch +Patch13: hplip-hpcups-sigpipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -151,6 +152,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # (bug #531330). %patch12 -p1 -b .plugin-error +# Avoid busy loop in hpcups when backend has exited (bug #525944). +%patch13 -p1 -b .hpcups-sigpipe + %build aclocal automake --foreign --add-missing --copy @@ -354,6 +358,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Oct 29 2009 Tim Waugh 3.9.8-19 +- Avoid busy loop in hpcups when backend has exited (bug #525944). + * Wed Oct 28 2009 Tim Waugh 3.9.8-18 - Set a printer-state-reason when there's a missing required plugin (bug #531330). From 7ae683284c2af3559a0e6da75fb3cbb7f1728ee6 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 29 Oct 2009 12:51:15 +0000 Subject: [PATCH 06/69] - Retry when connecting to device fails (bug #528483). --- hplip-retry-open.patch | 30 ++++++++++++++++++++++++++++++ hplip.spec | 13 +++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 hplip-retry-open.patch diff --git a/hplip-retry-open.patch b/hplip-retry-open.patch new file mode 100644 index 0000000..75723e7 --- /dev/null +++ b/hplip-retry-open.patch @@ -0,0 +1,30 @@ +diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c +--- hplip-3.9.8/prnt/backend/hp.c.retry-open 2009-10-27 11:46:00.181457688 +0000 ++++ hplip-3.9.8/prnt/backend/hp.c 2009-10-27 11:57:51.527583553 +0000 +@@ -724,11 +724,21 @@ int main(int argc, char *argv[]) + /* Open hp device. */ + while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK) + { +- if (stat != HPMUD_R_DEVICE_BUSY) +- { +- BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]); +- goto bugout; +- } ++ if (getenv ("CLASS") != NULL) ++ { ++ /* If the CLASS environment variable is set we ++ * need to give other class members a chance in ++ * case their devices are ready to go. ++ */ ++ ++ BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]); ++ BUG("INFO: queuing on next printer in class...\n"); ++ ++ /* Prevent job requeuing too quickly. */ ++ sleep (5); ++ ++ goto bugout; ++ } + + /* Display user error. */ + device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]); diff --git a/hplip.spec b/hplip.spec index 0285541..c5e530d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -24,8 +24,9 @@ Patch8: hplip-non-scripts.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch -Patch12: hplip-plugin-error.patch -Patch13: hplip-hpcups-sigpipe.patch +Patch12: hplip-retry-open.patch +Patch13: hplip-plugin-error.patch +Patch14: hplip-hpcups-sigpipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -148,12 +149,15 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected +# Retry when connecting to device fails (bug #528483). +%patch12 -p1 -b .retry-open + # Set a printer-state-reason when there's a missing required plugin # (bug #531330). -%patch12 -p1 -b .plugin-error +%patch13 -p1 -b .plugin-error # Avoid busy loop in hpcups when backend has exited (bug #525944). -%patch13 -p1 -b .hpcups-sigpipe +%patch14 -p1 -b .hpcups-sigpipe %build aclocal @@ -359,6 +363,7 @@ fi %changelog * Thu Oct 29 2009 Tim Waugh 3.9.8-19 +- Retry when connecting to device fails (bug #528483). - Avoid busy loop in hpcups when backend has exited (bug #525944). * Wed Oct 28 2009 Tim Waugh 3.9.8-18 From 2f3e7866ff8fcfd091dfec1a816d011cb8fda66b Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 30 Oct 2009 17:04:23 +0000 Subject: [PATCH 07/69] - Reverted retry patch until it can be tested some more. --- hplip-retry-open.patch | 30 ------------------------------ hplip.spec | 9 ++++----- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 hplip-retry-open.patch diff --git a/hplip-retry-open.patch b/hplip-retry-open.patch deleted file mode 100644 index 75723e7..0000000 --- a/hplip-retry-open.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.retry-open 2009-10-27 11:46:00.181457688 +0000 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-27 11:57:51.527583553 +0000 -@@ -724,11 +724,21 @@ int main(int argc, char *argv[]) - /* Open hp device. */ - while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK) - { -- if (stat != HPMUD_R_DEVICE_BUSY) -- { -- BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]); -- goto bugout; -- } -+ if (getenv ("CLASS") != NULL) -+ { -+ /* If the CLASS environment variable is set we -+ * need to give other class members a chance in -+ * case their devices are ready to go. -+ */ -+ -+ BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]); -+ BUG("INFO: queuing on next printer in class...\n"); -+ -+ /* Prevent job requeuing too quickly. */ -+ sleep (5); -+ -+ goto bugout; -+ } - - /* Display user error. */ - device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]); diff --git a/hplip.spec b/hplip.spec index c5e530d..98f1f37 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,7 +24,6 @@ Patch8: hplip-non-scripts.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch -Patch12: hplip-retry-open.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -149,9 +148,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected -# Retry when connecting to device fails (bug #528483). -%patch12 -p1 -b .retry-open - # Set a printer-state-reason when there's a missing required plugin # (bug #531330). %patch13 -p1 -b .plugin-error @@ -362,6 +358,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Fri Oct 30 2009 Tim Waugh 3.9.8-20 +- Reverted retry patch until it can be tested some more. + * Thu Oct 29 2009 Tim Waugh 3.9.8-19 - Retry when connecting to device fails (bug #528483). - Avoid busy loop in hpcups when backend has exited (bug #525944). From 8e3a7dd269d97ac7c9f7eacac2f40edeadeaf0a6 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 2 Nov 2009 16:36:24 +0000 Subject: [PATCH 08/69] - Added 'requires proprietary plugin' to appropriate model names (bug #513283). --- hplip-hpcups-plugin.patch | 318 ++++++++++++++++++++++++++++++++++++++ hplip.spec | 11 +- 2 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 hplip-hpcups-plugin.patch diff --git a/hplip-hpcups-plugin.patch b/hplip-hpcups-plugin.patch new file mode 100644 index 0000000..e466f31 --- /dev/null +++ b/hplip-hpcups-plugin.patch @@ -0,0 +1,318 @@ +diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin hplip-3.9.8/prnt/drv/hpcups.drv.in +--- hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin 2009-11-02 13:47:00.325103235 +0000 ++++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-02 14:48:00.070102977 +0000 +@@ -6659,7 +6659,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet m1522nf MFP" +- Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" ++ Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" + PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" +@@ -6723,7 +6723,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p2035n" +- Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version" ++ Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2035n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" + PCFileName "hp-laserjet_p2035n-pcl3.ppd" +@@ -6731,7 +6731,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p2035" +- Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version" ++ Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2035" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" + PCFileName "hp-laserjet_p2035-pcl3.ppd" +@@ -6864,7 +6864,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet m2727 MFP" +- Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version" ++ Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m2727 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m2727 mfp;DES:hp laserjet m2727 mfp;" + PCFileName "hp-laserjet_m2727_mfp-pcl3.ppd" +@@ -7734,7 +7734,7 @@ Manufacturer "HP" + // <%LJColor:Normal%> + { + ModelName "HP Color LaserJet cm1312 MFP" +- Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" + PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" +@@ -7742,7 +7742,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet cm1312nfi MFP" +- Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" + PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" +@@ -7816,7 +7816,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet cm2320 MFP" +- Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" + PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" +@@ -7824,7 +7824,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet cm2320fxi MFP" +- Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" + PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" +@@ -7832,7 +7832,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet cm2320n MFP" +- Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" + PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" +@@ -7840,7 +7840,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet cm2320nf MFP" +- Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" + PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" +@@ -10287,7 +10287,7 @@ Manufacturer "HP" + // <%LJZjsMono:Normal%> + { + ModelName "HP LaserJet 1000" +- Attribute "NickName" "" "HP LaserJet 1000, $Version" ++ Attribute "NickName" "" "HP LaserJet 1000, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1000" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1000;DES:hp laserjet 1000;" + PCFileName "hp-laserjet_1000.ppd" +@@ -10295,7 +10295,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet 1005 Series" +- Attribute "NickName" "" "HP LaserJet 1005 Series, $Version" ++ Attribute "NickName" "" "HP LaserJet 1005 Series, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1005 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" + PCFileName "hp-laserjet_1005_series.ppd" +@@ -10303,7 +10303,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet 1018" +- Attribute "NickName" "" "HP LaserJet 1018, $Version" ++ Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1018" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" + PCFileName "hp-laserjet_1018.ppd" +@@ -10312,7 +10312,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet 1020" +- Attribute "NickName" "" "HP LaserJet 1020, $Version" ++ Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1020" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" + PCFileName "hp-laserjet_1020.ppd" +@@ -10321,7 +10321,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet 1022nw" +- Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version" ++ Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1022nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022nw;DES:hp laserjet 1022nw;" + PCFileName "hp-laserjet_1022nw-zjs.ppd" +@@ -10329,7 +10329,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet 1022n" +- Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version" ++ Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1022n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022n;DES:hp laserjet 1022n;" + PCFileName "hp-laserjet_1022n-zjs.ppd" +@@ -10338,7 +10338,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet 1022" +- Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version" ++ Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1022" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022;DES:hp laserjet 1022;" + PCFileName "hp-laserjet_1022-zjs.ppd" +@@ -10346,7 +10346,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet m1120 MFP" +- Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version" ++ Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" + PCFileName "hp-laserjet_m1120_mfp.ppd" +@@ -10354,7 +10354,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet m1120n MFP" +- Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version" ++ Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m1120n MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" + PCFileName "hp-laserjet_m1120n_mfp.ppd" +@@ -10362,7 +10362,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet m1319f MFP" +- Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version" ++ Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" + PCFileName "hp-laserjet_m1319f_mfp.ppd" +@@ -10370,7 +10370,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p2035n" +- Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version" ++ Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2035n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" + PCFileName "hp-laserjet_p2035n-zjs.ppd" +@@ -10378,7 +10378,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p2035" +- Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version" ++ Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2035" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" + PCFileName "hp-laserjet_p2035-zjs.ppd" +@@ -10498,7 +10498,7 @@ Manufacturer "HP" + // <%LJZjsColor:Normal%> + { + ModelName "HP Color LaserJet cp1215" +- Attribute "NickName" "" "HP Color LaserJet cp1215, $Version" ++ Attribute "NickName" "" "HP Color LaserJet cp1215, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cp1215" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" + PCFileName "hp-color_laserjet_cp1215.ppd" +@@ -10506,7 +10506,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet 1600" +- Attribute "NickName" "" "HP Color LaserJet 1600, $Version" ++ Attribute "NickName" "" "HP Color LaserJet 1600, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 1600" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" + PCFileName "hp-color_laserjet_1600.ppd" +@@ -10514,7 +10514,7 @@ Manufacturer "HP" + } + { + ModelName "HP Color LaserJet 2600n" +- Attribute "NickName" "" "HP Color LaserJet 2600n, $Version" ++ Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 2600n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" + PCFileName "hp-color_laserjet_2600n.ppd" +@@ -10791,7 +10791,7 @@ Manufacturer "HP" + // <%LJm1005:Normal%> + { + ModelName "HP LaserJet m1005" +- Attribute "NickName" "" "HP LaserJet m1005, $Version" ++ Attribute "NickName" "" "HP LaserJet m1005, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet m1005" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1005;DES:hp laserjet m1005;" + PCFileName "hp-laserjet_m1005.ppd" +@@ -10799,7 +10799,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p1505n" +- Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version" ++ Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1505n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505n;DES:hp laserjet p1505n;" + PCFileName "hp-laserjet_p1505n-zxs.ppd" +@@ -10807,7 +10807,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p1505" +- Attribute "NickName" "" "HP LaserJet p1505, $Version" ++ Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1505" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" + PCFileName "hp-laserjet_p1505.ppd" +@@ -10815,7 +10815,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p2014" +- Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version" ++ Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2014" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014;DES:hp laserjet p2014;" + PCFileName "hp-laserjet_p2014-zxs.ppd" +@@ -10823,7 +10823,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p2014n" +- Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version" ++ Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p2014n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014n;DES:hp laserjet p2014n;" + PCFileName "hp-laserjet_p2014n-zxs.ppd" +@@ -10941,7 +10941,7 @@ Manufacturer "HP" + // <%LJP1XXX:Normal%> + { + ModelName "HP LaserJet p1005" +- Attribute "NickName" "" "HP LaserJet p1005, $Version" ++ Attribute "NickName" "" "HP LaserJet p1005, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1005" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" + PCFileName "hp-laserjet_p1005.ppd" +@@ -10949,7 +10949,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p1006" +- Attribute "NickName" "" "HP LaserJet p1006, $Version" ++ Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1006" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" + PCFileName "hp-laserjet_p1006.ppd" +@@ -10957,7 +10957,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p1007" +- Attribute "NickName" "" "HP LaserJet p1007, $Version" ++ Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1007" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" + PCFileName "hp-laserjet_p1007.ppd" +@@ -10965,7 +10965,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p1008" +- Attribute "NickName" "" "HP LaserJet p1008, $Version" ++ Attribute "NickName" "" "HP LaserJet p1008, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1008" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1008;DES:hp laserjet p1008;" + PCFileName "hp-laserjet_p1008.ppd" +@@ -10973,7 +10973,7 @@ Manufacturer "HP" + } + { + ModelName "HP LaserJet p1009" +- Attribute "NickName" "" "HP LaserJet p1009, $Version" ++ Attribute "NickName" "" "HP LaserJet p1009, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1009" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1009;DES:hp laserjet p1009;" + PCFileName "hp-laserjet_p1009.ppd" diff --git a/hplip.spec b/hplip.spec index 98f1f37..8c2a682 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch +Patch15: hplip-hpcups-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -155,6 +156,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe +# Added 'requires proprietary plugin' to appropriate model names +# (bug #513283). +%patch15 -p1 -b .hpcups-plugin + %build aclocal automake --foreign --add-missing --copy @@ -358,6 +363,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Mon Nov 2 2009 Tim Waugh 3.9.8-21 +- Added 'requires proprietary plugin' to appropriate model names + (bug #513283). + * Fri Oct 30 2009 Tim Waugh 3.9.8-20 - Reverted retry patch until it can be tested some more. From 7c586adbcb1e168d24b0b34f3fefc37dacbdcb80 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 18 Nov 2009 17:46:38 +0000 Subject: [PATCH 09/69] - Fixed duplex handling in hpcups.drv (bug #533462). --- hplip-duplex-vs-number-up.patch | 192 ++++++++++++++++++++++++++++++++ hplip.spec | 9 +- 2 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 hplip-duplex-vs-number-up.patch diff --git a/hplip-duplex-vs-number-up.patch b/hplip-duplex-vs-number-up.patch new file mode 100644 index 0000000..20097bc --- /dev/null +++ b/hplip-duplex-vs-number-up.patch @@ -0,0 +1,192 @@ +diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.duplex-vs-number-up hplip-3.9.8/prnt/drv/hpcups.drv.in +--- hplip-3.9.8/prnt/drv/hpcups.drv.in.duplex-vs-number-up 2009-11-18 16:23:26.600165519 +0000 ++++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-18 16:24:04.784163999 +0000 +@@ -126,7 +126,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -811,7 +811,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1045,7 +1045,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1262,7 +1262,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1675,7 +1675,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1889,7 +1889,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -2126,7 +2126,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -3756,7 +3756,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -4017,7 +4017,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -4245,7 +4245,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -4617,7 +4617,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -5033,7 +5033,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -5433,7 +5433,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -6272,7 +6272,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -7626,7 +7626,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -8299,7 +8299,7 @@ Manufacturer "HP" + + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10182,7 +10182,7 @@ Manufacturer "HP" + + Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10391,7 +10391,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10527,7 +10527,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10686,7 +10686,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10836,7 +10836,7 @@ Manufacturer "HP" + { + Group "General/General" + +- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 ++ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" diff --git a/hplip.spec b/hplip.spec index 8c2a682..2a17a78 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -27,6 +27,7 @@ Patch11: hplip-device-reconnected.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-hpcups-plugin.patch +Patch16: hplip-duplex-vs-number-up.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -160,6 +161,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # (bug #513283). %patch15 -p1 -b .hpcups-plugin +# Fixed duplex handling in hpcups.drv (bug #533462). +%patch16 -p1 -b .duplex-vs-number-up + %build aclocal automake --foreign --add-missing --copy @@ -363,6 +367,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Wed Nov 18 2009 Tim Waugh 3.9.8-22 +- Fixed duplex handling in hpcups.drv (bug #533462). + * Mon Nov 2 2009 Tim Waugh 3.9.8-21 - Added 'requires proprietary plugin' to appropriate model names (bug #513283). From 3b3bf27acb54559c4dd93b56b8850625c1a52d86 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:41 +0000 Subject: [PATCH 10/69] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c8fdf1d..5abfb6b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: hplip -# $Id: Makefile,v 1.1 2005/06/08 16:29:04 twaugh Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:52:08 notting Exp $ NAME := hplip SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7c05a6de31209f26abe20af474e32cedcd925f28 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 26 Nov 2009 13:40:10 +0000 Subject: [PATCH 11/69] - Removed duplex constraints on page sizes with imageable areas larger than possible when duplexing (bug #541572). - Fixed duplex reverse sides being horizontally flipped (bug #541604). --- hplip.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index 2a17a78..5b6ce63 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -164,6 +164,18 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed duplex handling in hpcups.drv (bug #533462). %patch16 -p1 -b .duplex-vs-number-up +sed -i.duplex-constraints \ + -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ + prnt/drv/hpcups.drv.in + +sed -i.duplex-constraints \ + -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ + prnt/drv/hpcups.drv.in +sed -i.flipped-duplex \ + -e 's,\(Attribute.*cupsBackSide\),//\1,' \ + -e 's,\(Attribute.*cupsFlipDuplex\),//\1,' \ + prnt/drv/hpcups.drv.in + %build aclocal automake --foreign --add-missing --copy @@ -367,6 +379,11 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Nov 26 2009 Tim Waugh 3.9.8-23 +- Removed duplex constraints on page sizes with imageable areas larger + than possible when duplexing (bug #541572). +- Fixed duplex reverse sides being horizontally flipped (bug #541604). + * Wed Nov 18 2009 Tim Waugh 3.9.8-22 - Fixed duplex handling in hpcups.drv (bug #533462). From 561081a7f3d471743e592cdf9dbc0f7944ffcac5 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 26 Nov 2009 13:41:26 +0000 Subject: [PATCH 12/69] Only need to run sed once here. --- hplip.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hplip.spec b/hplip.spec index 5b6ce63..b926877 100644 --- a/hplip.spec +++ b/hplip.spec @@ -164,10 +164,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed duplex handling in hpcups.drv (bug #533462). %patch16 -p1 -b .duplex-vs-number-up -sed -i.duplex-constraints \ - -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ - prnt/drv/hpcups.drv.in - sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in From ef2f507fb462dd3dd608ef1e84187d698089eb10 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 26 Nov 2009 14:34:53 +0000 Subject: [PATCH 13/69] - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). --- hplip-bad-low-ink-warning.patch | 39 +++++++++++++++++++++++++++++++++ hplip.spec | 9 +++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 hplip-bad-low-ink-warning.patch diff --git a/hplip-bad-low-ink-warning.patch b/hplip-bad-low-ink-warning.patch new file mode 100644 index 0000000..94af090 --- /dev/null +++ b/hplip-bad-low-ink-warning.patch @@ -0,0 +1,39 @@ +diff -up hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp +--- hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2009-08-04 22:43:01.000000000 +0100 ++++ hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp 2009-11-26 14:34:09.944179766 +0000 +@@ -2222,7 +2222,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + { + case '5': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { +@@ -2237,7 +2237,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + } + case '6': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { +@@ -2252,7 +2252,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + } + case '7': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { +@@ -2268,7 +2268,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + } + case '8': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { diff --git a/hplip.spec b/hplip.spec index b926877..be271ad 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -28,6 +28,7 @@ Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-hpcups-plugin.patch Patch16: hplip-duplex-vs-number-up.patch +Patch17: hplip-bad-low-ink-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -164,6 +165,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed duplex handling in hpcups.drv (bug #533462). %patch16 -p1 -b .duplex-vs-number-up +# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). +%patch17 -p1 -b .bad-low-ink-warning + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -375,6 +379,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Nov 26 2009 Tim Waugh 3.9.8-24 +- Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). + * Thu Nov 26 2009 Tim Waugh 3.9.8-23 - Removed duplex constraints on page sizes with imageable areas larger than possible when duplexing (bug #541572). From 11269ac07c9c99eed088e80861353f2e30f28165 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 10 Dec 2009 16:42:14 +0000 Subject: [PATCH 14/69] - Reverted fix for bug #533462 until bug #541604 is solved. --- hplip-duplex-vs-number-up.patch | 192 -------------------------------- hplip.spec | 17 +-- 2 files changed, 6 insertions(+), 203 deletions(-) delete mode 100644 hplip-duplex-vs-number-up.patch diff --git a/hplip-duplex-vs-number-up.patch b/hplip-duplex-vs-number-up.patch deleted file mode 100644 index 20097bc..0000000 --- a/hplip-duplex-vs-number-up.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.duplex-vs-number-up hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.duplex-vs-number-up 2009-11-18 16:23:26.600165519 +0000 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-18 16:24:04.784163999 +0000 -@@ -126,7 +126,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -811,7 +811,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -1045,7 +1045,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -1262,7 +1262,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -1675,7 +1675,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -1889,7 +1889,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -2126,7 +2126,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -3756,7 +3756,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -4017,7 +4017,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -4245,7 +4245,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -4617,7 +4617,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -5033,7 +5033,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -5433,7 +5433,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -6272,7 +6272,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -7626,7 +7626,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -8299,7 +8299,7 @@ Manufacturer "HP" - - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -10182,7 +10182,7 @@ Manufacturer "HP" - - Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -10391,7 +10391,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -10527,7 +10527,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -10686,7 +10686,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" -@@ -10836,7 +10836,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 -+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" diff --git a/hplip.spec b/hplip.spec index be271ad..1414010 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -27,8 +27,7 @@ Patch11: hplip-device-reconnected.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-hpcups-plugin.patch -Patch16: hplip-duplex-vs-number-up.patch -Patch17: hplip-bad-low-ink-warning.patch +Patch16: hplip-bad-low-ink-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -162,19 +161,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # (bug #513283). %patch15 -p1 -b .hpcups-plugin -# Fixed duplex handling in hpcups.drv (bug #533462). -%patch16 -p1 -b .duplex-vs-number-up - # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). -%patch17 -p1 -b .bad-low-ink-warning +%patch16 -p1 -b .bad-low-ink-warning sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in -sed -i.flipped-duplex \ - -e 's,\(Attribute.*cupsBackSide\),//\1,' \ - -e 's,\(Attribute.*cupsFlipDuplex\),//\1,' \ - prnt/drv/hpcups.drv.in %build aclocal @@ -379,6 +371,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Dec 10 2009 Tim Waugh 3.9.8-25 +- Reverted fix for bug #533462 until bug #541604 is solved. + * Thu Nov 26 2009 Tim Waugh 3.9.8-24 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). From 3c9d434ca5326bb9d37077bc645b8696fb1183c7 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 5 Jan 2010 13:27:00 +0000 Subject: [PATCH 15/69] - Don't ship PolicyKit mechanism (bug #551773). - Don't run automake/autoconf etc as it causes build failures. --- hplip-non-scripts.patch | 12 ------------ hplip.spec | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 hplip-non-scripts.patch diff --git a/hplip-non-scripts.patch b/hplip-non-scripts.patch deleted file mode 100644 index bbc2bc3..0000000 --- a/hplip-non-scripts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am ---- hplip-3.9.8/Makefile.am.non-scripts 2009-08-04 22:37:39.000000000 +0100 -+++ hplip-3.9.8/Makefile.am 2009-08-28 10:58:04.488778060 +0100 -@@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin - # base - basedir = $(hplipdir)/base - --dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \ -+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \ - base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \ - base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \ - base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \ diff --git a/hplip.spec b/hplip.spec index 1414010..4f5ca9f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -20,7 +20,6 @@ Patch4: hplip-no-asm.patch Patch5: hplip-clear-previous-state-reasons.patch Patch6: hplip-state-reasons-newline.patch Patch7: hplip-parenths.patch -Patch8: hplip-non-scripts.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -50,7 +49,6 @@ BuildRequires: libusb-devel BuildRequires: openssl-devel BuildRequires: sane-backends-devel BuildRequires: dbus-devel -BuildRequires: automake, autoconf, libtool %description The Hewlett-Packard Linux Imaging and Printing Project provides @@ -138,9 +136,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed typos in page sizes (bug #515469). %patch7 -p1 -b .parenths -# Don't install base/*.py with executable bit set. -%patch8 -p1 -b .non-scripts - # Set RequiresPageRegion in hpcups PPDs (bug #518756). %patch9 -p1 -b .requirespageregion @@ -169,14 +164,12 @@ sed -i.duplex-constraints \ prnt/drv/hpcups.drv.in %build -aclocal -automake --foreign --add-missing --copy -autoconf %configure \ --enable-scan-build --enable-gui-build --enable-fax-build \ --disable-foomatic-rip-hplip-install --enable-pp-build \ --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \ - --enable-hpijs-install --enable-udev-acl-rules + --enable-hpijs-install --enable-udev-acl-rules \ + --disable-policykit sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -191,7 +184,10 @@ make install DESTDIR=%{buildroot} # Remove unpackaged files rm -rf %{buildroot}%{_sysconfdir}/sane.d \ %{buildroot}%{_docdir} \ - %{buildroot}%{_datadir}/hal/fdi + %{buildroot}%{_datadir}/hal/fdi \ + %{buildroot}%{_datadir}/hplip/pkservice.py \ + %{buildroot}%{_datadir}/hplip/base/pkit.py \ + %{buildroot}%{_bindir}/hp-pkservice rm -f %{buildroot}%{_bindir}/foomatic-rip \ %{buildroot}%{_libdir}/cups/filter/foomatic-rip \ @@ -248,7 +244,6 @@ rm -rf %{buildroot} %{_bindir}/hp-makecopies %{_bindir}/hp-makeuri %{_bindir}/hp-mkuri -%{_bindir}/hp-pkservice %{_bindir}/hp-plugin %{_bindir}/hp-pqdiag %{_bindir}/hp-printsettings @@ -282,7 +277,6 @@ rm -rf %{buildroot} %{_datadir}/hplip/linefeedcal.py* %{_datadir}/hplip/makecopies.py* %{_datadir}/hplip/makeuri.py* -%{_datadir}/hplip/pkservice.py* %{_datadir}/hplip/plugin.py* %{_datadir}/hplip/pqdiag.py* %{_datadir}/hplip/printsettings.py* @@ -296,7 +290,8 @@ rm -rf %{buildroot} %{_datadir}/hplip/unload.py* %{_datadir}/hplip/wificonfig.py* # Directories -%{_datadir}/hplip/base +%dir %{_datadir}/hplip/base +%attr(0644,root,root) %{_datadir}/hplip/base/* %{_datadir}/hplip/copier %{_datadir}/hplip/data/ldl %{_datadir}/hplip/data/localization @@ -371,6 +366,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Tue Jan 5 2010 Tim Waugh - 3.9.8-26 +- Don't ship PolicyKit mechanism (bug #551773). +- Don't run automake/autoconf etc as it causes build failures. + * Thu Dec 10 2009 Tim Waugh 3.9.8-25 - Reverted fix for bug #533462 until bug #541604 is solved. From b7f8884abe1693de07f679dd9a9df9f625d91107 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 5 Jan 2010 15:19:52 +0000 Subject: [PATCH 16/69] - Retry when connecting to device fails (bug #532112). --- hplip-retry-open.patch | 30 ++++++++++++++++++++++++++++++ hplip.spec | 5 +++++ 2 files changed, 35 insertions(+) create mode 100644 hplip-retry-open.patch diff --git a/hplip-retry-open.patch b/hplip-retry-open.patch new file mode 100644 index 0000000..6a47f7b --- /dev/null +++ b/hplip-retry-open.patch @@ -0,0 +1,30 @@ +diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c +--- hplip-3.9.8/prnt/backend/hp.c.retry-open 2010-01-05 15:11:56.045911892 +0000 ++++ hplip-3.9.8/prnt/backend/hp.c 2010-01-05 15:12:04.236911642 +0000 +@@ -724,11 +724,21 @@ int main(int argc, char *argv[]) + /* Open hp device. */ + while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK) + { +- if (stat != HPMUD_R_DEVICE_BUSY) +- { +- BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]); +- goto bugout; +- } ++ if (getenv ("CLASS") != NULL) ++ { ++ /* If the CLASS environment variable is set we ++ * need to give other class members a chance in ++ * case their devices are ready to go. ++ */ ++ ++ BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]); ++ BUG("INFO: queuing on next printer in class...\n"); ++ ++ /* Prevent job requeuing too quickly. */ ++ sleep (5); ++ ++ goto bugout; ++ } + + /* Display user error. */ + device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]); diff --git a/hplip.spec b/hplip.spec index 4f5ca9f..d4cdfda 100644 --- a/hplip.spec +++ b/hplip.spec @@ -20,6 +20,7 @@ Patch4: hplip-no-asm.patch Patch5: hplip-clear-previous-state-reasons.patch Patch6: hplip-state-reasons-newline.patch Patch7: hplip-parenths.patch +Patch8: hplip-retry-open.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -136,6 +137,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed typos in page sizes (bug #515469). %patch7 -p1 -b .parenths +# Retry when connecting to device fails (bug #532112). +%patch8 -p1 -b .retry-open + # Set RequiresPageRegion in hpcups PPDs (bug #518756). %patch9 -p1 -b .requirespageregion @@ -367,6 +371,7 @@ fi %changelog * Tue Jan 5 2010 Tim Waugh - 3.9.8-26 +- Retry when connecting to device fails (bug #532112). - Don't ship PolicyKit mechanism (bug #551773). - Don't run automake/autoconf etc as it causes build failures. From 3de0019f248ae044306ac0769f2991e276682d72 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 12 Jan 2010 19:55:12 +0000 Subject: [PATCH 17/69] - Do ship pkit module even though the PolicyKit mechanism is not shipped (bug #554817). --- hplip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hplip.spec b/hplip.spec index d4cdfda..83479a6 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -190,7 +190,6 @@ rm -rf %{buildroot}%{_sysconfdir}/sane.d \ %{buildroot}%{_docdir} \ %{buildroot}%{_datadir}/hal/fdi \ %{buildroot}%{_datadir}/hplip/pkservice.py \ - %{buildroot}%{_datadir}/hplip/base/pkit.py \ %{buildroot}%{_bindir}/hp-pkservice rm -f %{buildroot}%{_bindir}/foomatic-rip \ @@ -370,6 +369,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Tue Jan 12 2010 Tim Waugh - 3.9.8-27 +- Do ship pkit module even though the PolicyKit mechanism is not + shipped (bug #554817). + * Tue Jan 5 2010 Tim Waugh - 3.9.8-26 - Retry when connecting to device fails (bug #532112). - Don't ship PolicyKit mechanism (bug #551773). From 9b5905ea41adc08b57d0046f18de1c227dae55cc Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 20 Jan 2010 12:25:22 +0000 Subject: [PATCH 18/69] - Fixed crash when using Preferences dialog (bug #555979). --- hplip-preferences-crash.patch | 14 ++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 hplip-preferences-crash.patch diff --git a/hplip-preferences-crash.patch b/hplip-preferences-crash.patch new file mode 100644 index 0000000..8800d09 --- /dev/null +++ b/hplip-preferences-crash.patch @@ -0,0 +1,14 @@ +diff -up hplip-3.9.8/ui4/devmgr5.py.preferences-crash hplip-3.9.8/ui4/devmgr5.py +--- hplip-3.9.8/ui4/devmgr5.py.preferences-crash 2009-08-04 22:37:22.000000000 +0100 ++++ hplip-3.9.8/ui4/devmgr5.py 2010-01-20 12:10:15.728561588 +0000 +@@ -2019,7 +2019,9 @@ class DevMgr5(QMainWindow, Ui_MainWindo + if dlg.exec_() == QDialog.Accepted: + self.user_settings.load() + +- self.cur_device.sendEvent(EVENT_USER_CONFIGURATION_CHANGED, self.cur_printer) ++ if self.cur_device is not None: ++ self.cur_device.sendEvent(EVENT_USER_CONFIGURATION_CHANGED, ++ self.cur_printer) + + + # *********************************************************************************** diff --git a/hplip.spec b/hplip.spec index 83479a6..09cd069 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -28,6 +28,7 @@ Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-hpcups-plugin.patch Patch16: hplip-bad-low-ink-warning.patch +Patch17: hplip-preferences-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning +# Fixed crash when using Preferences dialog (bug #555979). +%patch17 -p1 -b .preferences-crash + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -369,6 +373,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Wed Jan 20 2010 Tim Waugh - 3.9.8-28 +- Fixed crash when using Preferences dialog (bug #555979). + * Tue Jan 12 2010 Tim Waugh - 3.9.8-27 - Do ship pkit module even though the PolicyKit mechanism is not shipped (bug #554817). From 8667f877b5a601fd1d07784f293666d9baadd894 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 16 Feb 2010 15:49:24 +0000 Subject: [PATCH 19/69] - Ship %{_datadir}/hplip/prnt/plugins directory (bug #564551). --- hplip.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index 09cd069..ddebf43 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -222,6 +222,10 @@ echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio # Images in docdir should not be executable (bug #440552). find doc/images -type f -exec chmod 644 {} \; +# Create an empty plugins directory to make sure it gets the right +# SELinux file context (bug #564551). +%{__mkdir_p} %{buildroot}%{_datadir}/hplip/prnt/plugins + # Remove files we don't want to package. rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc rm -f %{buildroot}%{_datadir}/hplip/hplip-install @@ -307,6 +311,7 @@ rm -rf %{buildroot} %{_datadir}/hplip/installer %{_datadir}/hplip/pcard %{_datadir}/hplip/prnt +%{_datadir}/hplip/prnt/plugins %{_datadir}/hplip/scan %{_localstatedir}/lib/hp @@ -373,6 +378,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Tue Feb 16 2010 Tim Waugh - 3.9.8-29 +- Ship %%{_datadir}/hplip/prnt/plugins directory (bug #564551). + * Wed Jan 20 2010 Tim Waugh - 3.9.8-28 - Fixed crash when using Preferences dialog (bug #555979). From 099dc9c96fcab49bc9ff6d70eb0bf057cd5fa862 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:35:12 +0000 Subject: [PATCH 20/69] Initialize branch F-13 for hplip --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 10f54ed8a9712e7aade70f98f11d5c19a1377e5b Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 19 Feb 2010 12:27:12 +0000 Subject: [PATCH 21/69] Removed signature for old tarball. --- hplip-3.9.8.tar.gz.asc | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 hplip-3.9.8.tar.gz.asc diff --git a/hplip-3.9.8.tar.gz.asc b/hplip-3.9.8.tar.gz.asc deleted file mode 100644 index 1e975ad..0000000 --- a/hplip-3.9.8.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp4q+sACgkQhA7anpATwAWrnwCeNjw4P14Md8GsBRtbgLo+Hr6M -nwMAoJoSt8h4xjpXdmEWuhoFie0drfBT -=pkCz ------END PGP SIGNATURE----- From 93100edf5a43d289d9cb812e2e9dbe5484aa9ea7 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Sat, 20 Feb 2010 23:16:11 +0000 Subject: [PATCH 22/69] - Corrected several IEEE 1284 Device IDs using foomatic data (launchpad bug #523259). --- hplip-device-ids.patch | 1272 ++++++++++++++++++++++++++++++++++++++++ hplip.spec | 10 +- 2 files changed, 1281 insertions(+), 1 deletion(-) create mode 100644 hplip-device-ids.patch diff --git a/hplip-device-ids.patch b/hplip-device-ids.patch new file mode 100644 index 0000000..9f52a6d --- /dev/null +++ b/hplip-device-ids.patch @@ -0,0 +1,1272 @@ +diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hpcups.drv.in +--- hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids 2010-02-20 11:18:12.473921525 +0000 ++++ hplip-3.9.12/prnt/drv/hpcups.drv.in 2010-02-20 14:44:58.326282207 +0000 +@@ -401,7 +401,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + Attribute "NickName" "" "HP Officejet v40xi, $Version" + Attribute "ShortNickName" "" "HP Officejet v40xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40xi.ppd" + Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" + } +@@ -409,7 +409,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + Attribute "NickName" "" "HP Officejet v40, $Version" + Attribute "ShortNickName" "" "HP Officejet v40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40.ppd" + Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" +@@ -426,7 +426,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + Attribute "NickName" "" "HP Officejet g55, $Version" + Attribute "ShortNickName" "" "HP Officejet g55" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g55.ppd" + Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" + } +@@ -474,7 +474,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + Attribute "NickName" "" "HP Officejet g85, $Version" + Attribute "ShortNickName" "" "HP Officejet g85" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g85.ppd" + Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" + } +@@ -490,7 +490,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + Attribute "NickName" "" "HP Officejet g95, $Version" + Attribute "ShortNickName" "" "HP Officejet g95" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g95.ppd" + Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" + } +@@ -506,7 +506,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + Attribute "NickName" "" "HP PSC 750xi, $Version" + Attribute "ShortNickName" "" "HP PSC 750xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750xi.ppd" + Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" + } +@@ -514,7 +514,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + Attribute "NickName" "" "HP PSC 750, $Version" + Attribute "ShortNickName" "" "HP PSC 750" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750.ppd" + Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" + } +@@ -546,7 +546,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + Attribute "NickName" "" "HP PSC 900 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 900 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" + PCFileName "hp-psc_900_series.ppd" + Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" + } +@@ -562,7 +562,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 920c" + Attribute "NickName" "" "HP Deskjet 920c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 920c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" + PCFileName "hp-deskjet_920c.ppd" + Attribute "Product" "" "(HP Deskjet 920c Printer)" + Attribute "Product" "" "(HP Deskjet 920cvr Printer)" +@@ -581,7 +581,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 930c" + Attribute "NickName" "" "HP Deskjet 930c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 930c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" + PCFileName "hp-deskjet_930c.ppd" + Attribute "Product" "" "(HP Deskjet 930c Printer)" + Attribute "Product" "" "(HP Deskjet 930cm Printer)" +@@ -622,7 +622,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 940c" + Attribute "NickName" "" "HP Deskjet 940c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 940c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" + PCFileName "hp-deskjet_940c.ppd" + Attribute "Product" "" "(HP Deskjet 940cvr Printer)" + Attribute "Product" "" "(HP Deskjet 940c Printer)" +@@ -641,7 +641,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 950c" + Attribute "NickName" "" "HP Deskjet 950c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 950c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_950c.ppd" + Attribute "Product" "" "(HP Deskjet 950c Printer)" + } +@@ -706,7 +706,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 970c" + Attribute "NickName" "" "HP Deskjet 970c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 970c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" + PCFileName "hp-deskjet_970c.ppd" + Attribute "Product" "" "(HP Deskjet 970cxi Printer)" + Attribute "Product" "" "(HP Deskjet 970cse Printer)" +@@ -726,7 +726,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1000" + Attribute "NickName" "" "HP Photosmart p1000, $Version" + Attribute "ShortNickName" "" "HP Photosmart p1000" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" + PCFileName "hp-photosmart_p1000.ppd" + Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" + Attribute "Product" "" "(HP Photosmart p1000xi Printer)" +@@ -735,7 +735,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1100" + Attribute "NickName" "" "HP Photosmart p1100, $Version" + Attribute "ShortNickName" "" "HP Photosmart p1100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" + PCFileName "hp-photosmart_p1100.ppd" + Attribute "Product" "" "(HP Photosmart p1100 Printer)" + Attribute "Product" "" "(HP Photosmart p1100xi Printer)" +@@ -769,7 +769,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3820" + Attribute "NickName" "" "HP Deskjet 3820, $Version" + Attribute "ShortNickName" "" "HP Deskjet 3820" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;" + PCFileName "hp-deskjet_3820.ppd" + Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" +@@ -807,7 +807,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5105" + Attribute "NickName" "" "HP Officejet 5105, $Version" + Attribute "ShortNickName" "" "HP Officejet 5105" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5105.ppd" + Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" + } +@@ -815,7 +815,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5110v" + Attribute "NickName" "" "HP Officejet 5110v, $Version" + Attribute "ShortNickName" "" "HP Officejet 5110v" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5110v.ppd" + Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" + } +@@ -866,7 +866,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 1220c" + Attribute "NickName" "" "HP Deskjet 1220c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 1220c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;" + PCFileName "hp-deskjet_1220c.ppd" + Attribute "Product" "" "(HP Deskjet 1220c Printer)" + Attribute "Product" "" "(HP Deskjet 1220cse Printer)" +@@ -1062,7 +1062,7 @@ Manufacturer "HP" + ModelName "HP 2000c" + Attribute "NickName" "" "HP 2000c, $Version" + Attribute "ShortNickName" "" "HP 2000c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;" + PCFileName "hp-2000c.ppd" + Attribute "Product" "" "(HP 2000cse Printer)" + Attribute "Product" "" "(HP 2000c Printer)" +@@ -1504,7 +1504,7 @@ Manufacturer "HP" + ModelName "HP Officejet D Series" + Attribute "NickName" "" "HP Officejet D Series, $Version" + Attribute "ShortNickName" "" "HP Officejet D Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" + PCFileName "hp-officejet_d_series.ppd" + Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" + Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" +@@ -1527,7 +1527,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 960c" + Attribute "NickName" "" "HP Deskjet 960c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 960c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;" + PCFileName "hp-deskjet_960c.ppd" + Attribute "Product" "" "(HP Deskjet 960cse Printer)" + Attribute "Product" "" "(HP Deskjet 960cxi Printer)" +@@ -1537,7 +1537,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 980c" + Attribute "NickName" "" "HP Deskjet 980c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 980c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;" + PCFileName "hp-deskjet_980c.ppd" + Attribute "Product" "" "(HP Deskjet 980cxi Printer)" + Attribute "Product" "" "(HP Deskjet 980c Printer)" +@@ -1546,7 +1546,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 990c" + Attribute "NickName" "" "HP Deskjet 990c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 990c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;" + PCFileName "hp-deskjet_990c.ppd" + Attribute "Product" "" "(HP Deskjet 990cxi Printer)" + Attribute "Product" "" "(HP Deskjet 990cse Printer)" +@@ -1609,7 +1609,7 @@ Manufacturer "HP" + ModelName "HP Color Inkjet cp1700" + Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" + Attribute "ShortNickName" "" "HP Color Inkjet cp1700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" + PCFileName "hp-color_inkjet_cp1700.ppd" + Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" + } +@@ -1617,7 +1617,7 @@ Manufacturer "HP" + ModelName "HP PSC 2100 Series" + Attribute "NickName" "" "HP PSC 2100 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" + PCFileName "hp-psc_2100_series.ppd" + Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" +@@ -1630,7 +1630,7 @@ Manufacturer "HP" + ModelName "HP PSC 2150 Series" + Attribute "NickName" "" "HP PSC 2150 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" + PCFileName "hp-psc_2150_series.ppd" + Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" + } +@@ -1638,7 +1638,7 @@ Manufacturer "HP" + ModelName "HP PSC 2170 Series" + Attribute "NickName" "" "HP PSC 2170 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2170 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" + PCFileName "hp-psc_2170_series.ppd" + Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" +@@ -1675,7 +1675,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7100 Series" + Attribute "NickName" "" "HP Officejet 7100 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;" + PCFileName "hp-officejet_7100_series.ppd" + Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" +@@ -1905,7 +1905,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2200" + Attribute "NickName" "" "HP Business Inkjet 2200, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;" + PCFileName "hp-business_inkjet_2200.ppd" + Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" +@@ -1915,7 +1915,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2230" + Attribute "NickName" "" "HP Business Inkjet 2230, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2230" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;" + PCFileName "hp-business_inkjet_2230.ppd" + Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" + } +@@ -1923,7 +1923,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2250" + Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2250" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;" + PCFileName "hp-business_inkjet_2250-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" +@@ -1932,7 +1932,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2280" + Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2280" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;" + PCFileName "hp-business_inkjet_2280-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" +@@ -2471,7 +2471,7 @@ Manufacturer "HP" + ModelName "HP PSC 1600 Series" + Attribute "NickName" "" "HP PSC 1600 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1600 series;DES:psc 1600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1600 series;DES:psc 1600 series;" + PCFileName "hp-psc_1600_series.ppd" + Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" +@@ -2487,7 +2487,7 @@ Manufacturer "HP" + ModelName "HP PSC 2200 Series" + Attribute "NickName" "" "HP PSC 2200 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" + PCFileName "hp-psc_2200_series.ppd" + Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" + } +@@ -2505,7 +2505,7 @@ Manufacturer "HP" + ModelName "HP PSC 2300 Series" + Attribute "NickName" "" "HP PSC 2300 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" + PCFileName "hp-psc_2300_series.ppd" + Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" +@@ -2514,7 +2514,7 @@ Manufacturer "HP" + ModelName "HP PSC 2350 Series" + Attribute "NickName" "" "HP PSC 2350 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2350 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" + PCFileName "hp-psc_2350_series.ppd" + Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" +@@ -2531,7 +2531,7 @@ Manufacturer "HP" + ModelName "HP PSC 2400 Series" + Attribute "NickName" "" "HP PSC 2400 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2400 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2400 Series;DES:psc 2400 series;" + PCFileName "hp-psc_2400_series.ppd" + Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" +@@ -2557,7 +2557,7 @@ Manufacturer "HP" + ModelName "HP PSC 2500 Series" + Attribute "NickName" "" "HP PSC 2500 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2500 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" + PCFileName "hp-psc_2500_series.ppd" + Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" +@@ -3032,7 +3032,7 @@ Manufacturer "HP" + ModelName "HP Officejet j5700 Series" + Attribute "NickName" "" "HP Officejet j5700 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet j5700 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" + PCFileName "hp-officejet_j5700_series.ppd" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" +@@ -3121,7 +3121,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6100 Series" + Attribute "NickName" "" "HP Officejet 6100 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 6100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" + PCFileName "hp-officejet_6100_series.ppd" + Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" +@@ -3190,7 +3190,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6300 Series" + Attribute "NickName" "" "HP Officejet 6300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 6300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6300 series;DES:officejet 6300 series;" + PCFileName "hp-officejet_6300_series.ppd" + Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" +@@ -3377,7 +3377,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7200 Series" + Attribute "NickName" "" "HP Officejet 7200 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;" + PCFileName "hp-officejet_7200_series.ppd" + Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" +@@ -3414,7 +3414,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7300 Series" + Attribute "NickName" "" "HP Officejet 7300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7300 series;DES:officejet 7300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7300 series;DES:officejet 7300 series;" + PCFileName "hp-officejet_7300_series.ppd" + Attribute "Product" "" "(HP Officejet 7310 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7310xi All-in-one Printer)" +@@ -3462,7 +3462,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7400 Series" + Attribute "NickName" "" "HP Officejet 7400 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7400 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;" + PCFileName "hp-officejet_7400_series.ppd" + Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" +@@ -5273,7 +5273,7 @@ Manufacturer "HP" + ModelName "HP PSC 1100 Series" + Attribute "NickName" "" "HP PSC 1100 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" + PCFileName "hp-psc_1100_series.ppd" + Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" +@@ -5283,7 +5283,7 @@ Manufacturer "HP" + ModelName "HP PSC 1200 Series" + Attribute "NickName" "" "HP PSC 1200 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" + PCFileName "hp-psc_1200_series.ppd" + Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" +@@ -5475,7 +5475,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4100 Series" + Attribute "NickName" "" "HP Officejet 4100 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 4100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;" + PCFileName "hp-officejet_4100_series.ppd" + Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" +@@ -5502,7 +5502,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4300 Series" + Attribute "NickName" "" "HP Officejet 4300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 4300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;" + PCFileName "hp-officejet_4300_series.ppd" + Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" +@@ -5800,7 +5800,7 @@ Manufacturer "HP" + ModelName "HP Officejet j3600 Series" + Attribute "NickName" "" "HP Officejet j3600 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet j3600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" + PCFileName "hp-officejet_j3600_series.ppd" + Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" +@@ -5871,7 +5871,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4200 Series" + Attribute "NickName" "" "HP Officejet 4200 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 4200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;" + PCFileName "hp-officejet_4200_series.ppd" + Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" +@@ -6835,7 +6835,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4 Plus" + Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4 Plus" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4 plus;DES:hp laserjet 4 plus;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;DES:hp laserjet 4 plus;" + PCFileName "hp-laserjet_4_plus-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" + Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" +@@ -6861,7 +6861,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5mp" + Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" + PCFileName "hp-laserjet_5mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5mp Printer)" + } +@@ -6869,7 +6869,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5l" + Attribute "NickName" "" "HP LaserJet 5l, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5l" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5l;DES:hp laserjet 5l;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;" + PCFileName "hp-laserjet_5l.ppd" + Attribute "Product" "" "(HP LaserJet 5l Printer)" + Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" +@@ -6879,7 +6879,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5p" + Attribute "NickName" "" "HP LaserJet 5p, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5p" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5p;DES:hp laserjet 5p;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;" + PCFileName "hp-laserjet_5p.ppd" + Attribute "Product" "" "(HP LaserJet 5p Printer)" + } +@@ -6887,7 +6887,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6l" + Attribute "NickName" "" "HP LaserJet 6l, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6l" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6l;DES:hp laserjet 6l;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:hp laserjet 6l;" + PCFileName "hp-laserjet_6l.ppd" + Attribute "Product" "" "(HP LaserJet 6l Printer)" + Attribute "Product" "" "(HP LaserJet 6lse Printer)" +@@ -6899,7 +6899,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6p" + Attribute "NickName" "" "HP LaserJet 6p, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6p" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6p;DES:hp laserjet 6p;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;" + PCFileName "hp-laserjet_6p.ppd" + Attribute "Product" "" "(HP LaserJet 6p Printer)" + } +@@ -6907,7 +6907,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6mp" + Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6mp;DES:hp laserjet 6mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;" + PCFileName "hp-laserjet_6mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 6mp Printer)" + Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" +@@ -6917,7 +6917,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1015" + Attribute "NickName" "" "HP LaserJet 1015, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1015" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1015;DES:hp laserjet 1015;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1015;DES:hp laserjet 1015;" + PCFileName "hp-laserjet_1015.ppd" + Attribute "Product" "" "(HP LaserJet 1015 Printer)" + } +@@ -6959,7 +6959,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1100" + Attribute "NickName" "" "HP LaserJet 1100, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1100;DES:hp laserjet 1100;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;" + PCFileName "hp-laserjet_1100.ppd" + Attribute "Product" "" "(HP LaserJet 1100 Printer)" + Attribute "Product" "" "(HP LaserJet 1100se Printer)" +@@ -6977,7 +6977,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1150" + Attribute "NickName" "" "HP LaserJet 1150, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1150" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1150;DES:hp laserjet 1150;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;" + PCFileName "hp-laserjet_1150.ppd" + Attribute "Product" "" "(HP LaserJet 1150 Printer)" + } +@@ -6994,7 +6994,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1160 Series" + Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1160 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1160 series;DES:hp laserjet 1160 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;" + PCFileName "hp-laserjet_1160_series.ppd" + Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" + } +@@ -7002,7 +7002,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1200" + Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1200;DES:hp laserjet 1200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:hp laserjet 1200;" + PCFileName "hp-laserjet_1200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1200 Printer)" + Attribute "Product" "" "(HP LaserJet 1200se Printer)" +@@ -7027,7 +7027,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1220" + Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1220" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1220;DES:hp laserjet 1220;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;" + PCFileName "hp-laserjet_1220-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" + } +@@ -7035,7 +7035,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1300" + Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1300;DES:hp laserjet 1300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" + PCFileName "hp-laserjet_1300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1300 Printer)" + Attribute "Product" "" "(HP LaserJet 1300t Printer)" +@@ -7060,7 +7060,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1320 Series" + Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1320 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320 series;DES:hp laserjet 1320 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + PCFileName "hp-laserjet_1320_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" + } +@@ -7157,7 +7157,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p2015 Series" + Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p2015 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2015 series;DES:hp laserjet p2015 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + PCFileName "hp-laserjet_p2015_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p2015 Printer)" + } +@@ -7233,7 +7233,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2100 Series" + Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100 series;DES:hp laserjet 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;" + PCFileName "hp-laserjet_2100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" + } +@@ -7249,7 +7249,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2200" + Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200;DES:hp laserjet 2200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" + PCFileName "hp-laserjet_2200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2200 Printer)" + Attribute "Product" "" "(HP LaserJet 2200d Printer)" +@@ -7275,7 +7275,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2300 Series" + Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300 series;DES:hp laserjet 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" + PCFileName "hp-laserjet_2300_series.ppd" + Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" + } +@@ -7291,7 +7291,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2420" + Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2420" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2420;DES:hp laserjet 2420;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;" + PCFileName "hp-laserjet_2420-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2420 Printer)" + Attribute "Product" "" "(HP LaserJet 2420d Printer)" +@@ -7302,7 +7302,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2430" + Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2430" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2430;DES:hp laserjet 2430;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;" + PCFileName "hp-laserjet_2430-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2430t Printer)" + Attribute "Product" "" "(HP LaserJet 2430 Printer)" +@@ -7352,7 +7352,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3015" + Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3015" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3015;DES:hp laserjet 3015;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;" + PCFileName "hp-laserjet_3015-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" + } +@@ -7360,7 +7360,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3020" + Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3020" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3020;DES:hp laserjet 3020;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;" + PCFileName "hp-laserjet_3020-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" + } +@@ -7368,7 +7368,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m3027 MFP" + Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3027 mfp;DES:hp laserjet m3027 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;DES:Hewlett-Packard LaserJet M3027 MFP;" + PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" +@@ -7377,7 +7377,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3030" + Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3030" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3030;DES:hp laserjet 3030;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;" + PCFileName "hp-laserjet_3030-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" + } +@@ -7385,7 +7385,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3050" + Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3050" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3050;DES:hp laserjet 3050;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;" + PCFileName "hp-laserjet_3050-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" + Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" +@@ -7394,7 +7394,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3052" + Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3052" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3052;DES:hp laserjet 3052;" ++ Attribute "1284DeviceID" "" "MFG:HEwlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;" + PCFileName "hp-laserjet_3052-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" + } +@@ -7402,7 +7402,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3055" + Attribute "NickName" "" "HP LaserJet 3055, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3055" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3055;DES:hp laserjet 3055;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;" + PCFileName "hp-laserjet_3055.ppd" + Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" + } +@@ -7430,7 +7430,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3200m" + Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3200m" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200m;DES:hp laserjet 3200m;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;" + PCFileName "hp-laserjet_3200m-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" + } +@@ -7446,7 +7446,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3200" + Attribute "NickName" "" "HP LaserJet 3200, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200;DES:hp laserjet 3200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;" + PCFileName "hp-laserjet_3200.ppd" + Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" + } +@@ -7466,7 +7466,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3330" + Attribute "NickName" "" "HP LaserJet 3330, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3330" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3330;DES:hp laserjet 3330;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;" + PCFileName "hp-laserjet_3330.ppd" + Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" + } +@@ -7474,7 +7474,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3380" + Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3380" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3380;DES:hp laserjet 3380;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;" + PCFileName "hp-laserjet_3380-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" + } +@@ -7482,7 +7482,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3390" + Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3390" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3390;DES:hp laserjet 3390;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" + PCFileName "hp-laserjet_3390-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" + } +@@ -7498,7 +7498,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4000 Series" + Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4000 series;DES:hp laserjet 4000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;" + PCFileName "hp-laserjet_4000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4000 Printer)" + Attribute "Product" "" "(HP LaserJet 4000n Printer)" +@@ -7574,7 +7574,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4050 Series" + Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4050 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4050 series;DES:hp laserjet 4050 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series;DES:Hewlett-Packard LaserJet 4050 Series;" + PCFileName "hp-laserjet_4050_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4050 Printer)" + Attribute "Product" "" "(HP LaserJet 4050n Printer)" +@@ -7586,7 +7586,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4100 Series" + Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4100 series;DES:hp laserjet 4100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series;DES:Hewlett-Packard LaserJet 4100 Series;" + PCFileName "hp-laserjet_4100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 410dtn Printer)" + Attribute "Product" "" "(HP LaserJet 4100tn Printer)" +@@ -7614,7 +7614,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4200" + Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4200;DES:hp laserjet 4200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;" + PCFileName "hp-laserjet_4200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4200 Printer)" + Attribute "Product" "" "(HP LaserJet 4200l Printer)" +@@ -7639,7 +7639,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4250" + Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4250" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4250;DES:hp laserjet 4250;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" + PCFileName "hp-laserjet_4250-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4250 Printer)" + Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" +@@ -7651,7 +7651,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4300" + Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4300;DES:hp laserjet 4300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;DES:hp laserjet 4300;" + PCFileName "hp-laserjet_4300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4300 Printer)" + Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" +@@ -7664,7 +7664,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4345 MFP" + Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4345 mfp;DES:hp laserjet 4345 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4345 mfp;DES:hp laserjet 4345 mfp;" + PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" +@@ -7675,7 +7675,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m4345 MFP" + Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m4345 mfp;DES:hp laserjet m4345 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M4345 MFP;DES:Hewlett-Packard LaserJet M4345 MFP;" + PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" +@@ -7746,7 +7746,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5000 Series" + Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5000 series;DES:hp laserjet 5000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;" + PCFileName "hp-laserjet_5000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" + } +@@ -7856,7 +7856,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5si" + Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5si" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5si;DES:hp laserjet 5si;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:;" + PCFileName "hp-laserjet_5si-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5si Printer)" + Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" +@@ -7892,7 +7892,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m3035 MFP" + Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3035 mfp;DES:hp laserjet m3035 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;DES:Hewlett-Packard LaserJet M3035 MFP;" + PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" +@@ -7913,7 +7913,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m5025 MFP" + Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5025 mfp;DES:hp laserjet m5025 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5025 MFP;DES:Hewlett-Packard LaserJet M5025 MFP;" + PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" + } +@@ -7921,7 +7921,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m5035 MFP" + Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5035 mfp;DES:hp laserjet m5035 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5035 MFP;DES:Hewlett-Packard LaserJet M5035 MFP;" + PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" +@@ -7982,7 +7982,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8150 Series" + Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8150 series;DES:hp laserjet 8150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;" + PCFileName "hp-laserjet_8150_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 8150 Printer)" + Attribute "Product" "" "(HP LaserJet 8150n Printer)" +@@ -8259,7 +8259,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2300" + Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" + PCFileName "hp-business_inkjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" +@@ -8428,7 +8428,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4550" + Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550;DES:Hewlett-Packard Color LaserJet 4550;" + PCFileName "hp-color_laserjet_4550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" +@@ -8441,7 +8441,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4600 Series" + Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" + PCFileName "hp-color_laserjet_4600_series.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" +@@ -8539,7 +8539,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet 9100 Series" + Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Officejet 9100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" + PCFileName "hp-officejet_9100_series-pcl3.ppd" + Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" +@@ -8580,7 +8580,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2800" + Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2800" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;" + PCFileName "hp-business_inkjet_2800-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" +@@ -8872,7 +8872,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1010" + Attribute "NickName" "" "HP LaserJet 1010, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1010" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1010;DES:hp laserjet 1010;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1010;DES:Hewlett-Packard LaserJet 1010;" + PCFileName "hp-laserjet_1010.ppd" + Attribute "Product" "" "(HP LaserJet 1010 Printer)" + } +@@ -8880,7 +8880,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1012" + Attribute "NickName" "" "HP LaserJet 1012, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1012" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1012;DES:hp laserjet 1012;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1012;DES:hp laserjet 1012;" + PCFileName "hp-laserjet_1012.ppd" + Attribute "Product" "" "(HP LaserJet 1012 Printer)" + } +@@ -9088,7 +9088,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Lx" + Attribute "NickName" "" "HP Officejet Lx, $Version" + Attribute "ShortNickName" "" "HP Officejet Lx" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;" + PCFileName "hp-officejet_lx.ppd" + Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" + } +@@ -9252,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 300" + Attribute "NickName" "" "HP Officejet Series 300, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" + PCFileName "hp-officejet_series_300.ppd" + Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" + } +@@ -9276,7 +9276,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 400" + Attribute "NickName" "" "HP Deskjet 400, $Version" + Attribute "ShortNickName" "" "HP Deskjet 400" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" + PCFileName "hp-deskjet_400.ppd" + Attribute "Product" "" "(HP Deskjet 400 Printer)" + Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" +@@ -9293,7 +9293,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 540" + Attribute "NickName" "" "HP Deskjet 540, $Version" + Attribute "ShortNickName" "" "HP Deskjet 540" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;" + PCFileName "hp-deskjet_540.ppd" + Attribute "Product" "" "(HP Deskjet 540 Printer)" + } +@@ -9418,7 +9418,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 630c" + Attribute "NickName" "" "HP Deskjet 630c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 630c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;" + PCFileName "hp-deskjet_630c.ppd" + Attribute "Product" "" "(HP Deskjet 630c Printer)" + } +@@ -9434,7 +9434,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 656c" + Attribute "NickName" "" "HP Deskjet 656c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 656c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;" + PCFileName "hp-deskjet_656c.ppd" + Attribute "Product" "" "(HP Deskjet 656c Printer)" + Attribute "Product" "" "(HP Deskjet 656cvr Printer)" +@@ -9547,7 +9547,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 600" + Attribute "NickName" "" "HP Deskjet 600, $Version" + Attribute "ShortNickName" "" "HP Deskjet 600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;" + PCFileName "hp-deskjet_600.ppd" + Attribute "Product" "" "(HP Deskjet 600c Printer)" + Attribute "Product" "" "(HP Deskjet 600 Printer)" +@@ -9569,7 +9569,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 500" + Attribute "NickName" "" "HP Officejet Series 500, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 500;DES:officejet series 500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 500;DES:officejet series 500;" + PCFileName "hp-officejet_series_500.ppd" + Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" + } +@@ -9609,7 +9609,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 600" + Attribute "NickName" "" "HP Officejet Series 600, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;" + PCFileName "hp-officejet_series_600.ppd" + Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" + } +@@ -9661,7 +9661,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 670c" + Attribute "NickName" "" "HP Deskjet 670c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 670c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" + PCFileName "hp-deskjet_670c.ppd" + Attribute "Product" "" "(HP Deskjet 670c)" + } +@@ -9813,7 +9813,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 610c" + Attribute "NickName" "" "HP Deskjet 610c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 610c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;" + PCFileName "hp-deskjet_610c.ppd" + Attribute "Product" "" "(HP Deskjet 610c Printer)" + } +@@ -9837,7 +9837,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 640c" + Attribute "NickName" "" "HP Deskjet 640c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 640c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;" + PCFileName "hp-deskjet_640c.ppd" + Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" + Attribute "Product" "" "(HP Deskjet 640c Printer)" +@@ -9857,7 +9857,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 690c" + Attribute "NickName" "" "HP Deskjet 690c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 690c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;" + PCFileName "hp-deskjet_690c.ppd" + Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" + Attribute "Product" "" "(HP Deskjet 690c Printer)" +@@ -9917,7 +9917,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 700" + Attribute "NickName" "" "HP Officejet Series 700, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;" + PCFileName "hp-officejet_series_700.ppd" + Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" + } +@@ -10060,7 +10060,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet T Series" + Attribute "NickName" "" "HP Officejet T Series, $Version" + Attribute "ShortNickName" "" "HP Officejet T Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" + PCFileName "hp-officejet_t_series.ppd" + Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" +@@ -10071,7 +10071,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r40" + Attribute "NickName" "" "HP Officejet r40, $Version" + Attribute "ShortNickName" "" "HP Officejet r40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" + PCFileName "hp-officejet_r40.ppd" + Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" + } +@@ -10095,7 +10095,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r60" + Attribute "NickName" "" "HP Officejet r60, $Version" + Attribute "ShortNickName" "" "HP Officejet r60" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" + PCFileName "hp-officejet_r60.ppd" + Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" + } +@@ -10103,7 +10103,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r65" + Attribute "NickName" "" "HP Officejet r65, $Version" + Attribute "ShortNickName" "" "HP Officejet r65" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" + PCFileName "hp-officejet_r65.ppd" + Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" + } +@@ -10119,7 +10119,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r80" + Attribute "NickName" "" "HP Officejet r80, $Version" + Attribute "ShortNickName" "" "HP Officejet r80" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" + PCFileName "hp-officejet_r80.ppd" + Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" + } +@@ -10127,7 +10127,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP PSC 500" + Attribute "NickName" "" "HP PSC 500, $Version" + Attribute "ShortNickName" "" "HP PSC 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" + PCFileName "hp-psc_500.ppd" + Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" +@@ -10144,7 +10144,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 812c" + Attribute "NickName" "" "HP Deskjet 812c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 812c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;" + PCFileName "hp-deskjet_812c.ppd" + Attribute "Product" "" "(HP Deskjet 812c Printer)" + } +@@ -10152,7 +10152,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 815c" + Attribute "NickName" "" "HP Deskjet 815c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 815c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;" + PCFileName "hp-deskjet_815c.ppd" + Attribute "Product" "" "(HP Deskjet 815c Printer)" + } +@@ -10184,7 +10184,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 840c" + Attribute "NickName" "" "HP Deskjet 840c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 840c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;" + PCFileName "hp-deskjet_840c.ppd" + Attribute "Product" "" "(HP Deskjet 840c Printer)" + } +@@ -10192,7 +10192,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 841c" + Attribute "NickName" "" "HP Deskjet 841c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 841c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;" + PCFileName "hp-deskjet_841c.ppd" + Attribute "Product" "" "(HP Deskjet 841c Printer)" + } +@@ -10208,7 +10208,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 843c" + Attribute "NickName" "" "HP Deskjet 843c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 843c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;" + PCFileName "hp-deskjet_843c.ppd" + Attribute "Product" "" "(HP Deskjet 843c Printer)" + Attribute "Product" "" "(HP Deskjet 843cxe Printer)" +@@ -10217,7 +10217,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 880c" + Attribute "NickName" "" "HP Deskjet 880c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 880c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;" + PCFileName "hp-deskjet_880c.ppd" + Attribute "Product" "" "(HP Deskjet 880c Printer)" + } +@@ -10233,7 +10233,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 895c" + Attribute "NickName" "" "HP Deskjet 895c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 895c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;" + PCFileName "hp-deskjet_895c.ppd" + Attribute "Product" "" "(HP Deskjet 895cse Printer)" + Attribute "Product" "" "(HP Deskjet 895c Printer)" +@@ -10350,7 +10350,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 825c" + Attribute "NickName" "" "HP Deskjet 825c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 825c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;" + PCFileName "hp-deskjet_825c.ppd" + Attribute "Product" "" "(HP Deskjet 825cvr Printer)" + Attribute "Product" "" "(HP Deskjet 825c Printer)" +@@ -10359,7 +10359,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 845c" + Attribute "NickName" "" "HP Deskjet 845c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 845c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;" + PCFileName "hp-deskjet_845c.ppd" + Attribute "Product" "" "(HP Deskjet 845c Printer)" + Attribute "Product" "" "(HP Deskjet 845cvr Printer)" +@@ -10470,7 +10470,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 850c" + Attribute "NickName" "" "HP Deskjet 850c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 850c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" + PCFileName "hp-deskjet_850c.ppd" + Attribute "Product" "" "(HP Deskjet 850k Printer)" + Attribute "Product" "" "(HP Deskjet 850c Printer)" +@@ -10489,7 +10489,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 870c" + Attribute "NickName" "" "HP Deskjet 870c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 870c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" + PCFileName "hp-deskjet_870c.ppd" + Attribute "Product" "" "(HP Deskjet 870k Printer)" + Attribute "Product" "" "(HP Deskjet 870c Printer)" +@@ -10500,7 +10500,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1150c" + Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1150c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" + PCFileName "hp-officejet_pro_1150c.ppd" + Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" +@@ -10614,7 +10614,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 890c" + Attribute "NickName" "" "HP Deskjet 890c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 890c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" + PCFileName "hp-deskjet_890c.ppd" + Attribute "Product" "" "(HP Deskjet 890cse Printer)" + Attribute "Product" "" "(HP Deskjet 890c Printer)" +@@ -10623,7 +10623,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1170c Series" + Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" + PCFileName "hp-officejet_pro_1170c_series.ppd" + Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" +@@ -11116,7 +11116,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3500" + Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 3500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3500;DES:hp color laserjet 3500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3500;DES:Hewlett-Packard color LaserJet 3500;" + PCFileName "hp-color_laserjet_3500.ppd" + Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" +@@ -11126,7 +11126,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3550" + Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 3550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3550;DES:hp color laserjet 3550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3550;DES:Hewlett-Packard color LaserJet 3550;" + PCFileName "hp-color_laserjet_3550.ppd" + Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" + } diff --git a/hplip.spec b/hplip.spec index 21be65a..9a7880b 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.12 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -17,6 +17,7 @@ Patch1: hplip-preferences-crash.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch +Patch5: hplip-device-ids.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -125,6 +126,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Make sure to avoid handwritten asm. %patch4 -p1 -b .no-asm +# Corrected several IEEE 1284 Device IDs using foomatic data. +%patch5 -p1 -b .device-ids + # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -350,6 +354,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Sat Feb 20 2010 Tim Waugh - 3.9.12-8 +- Corrected several IEEE 1284 Device IDs using foomatic data + (launchpad bug #523259). + * Tue Feb 16 2010 Tim Waugh - 3.9.12-7 - Ship %%{_datadir}/hplip/prnt/plugins directory (bug #564551). From d0bc1ba9bf31c64ac97a06d08e857d2aab657715 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 26 Feb 2010 12:41:25 +0000 Subject: [PATCH 23/69] - 3.10.2. No longer need preferences-crash patch. - The pstotiff filter is rubbish so replace it (launchpad #528394). - Stopped hpcups pointlessly trying to read spool files directly (bug #552572). --- .cvsignore | 1 + hplip-3.10.2.tar.gz.asc | 7 ++++ hplip-3.9.12.tar.gz.asc | 7 ---- hplip-mucks-with-spooldir.patch | 30 +++++++++++++++++ hplip-pstotiff-is-rubbish.patch | 58 +++++++++++++++++++++++++++++++++ hplip.spec | 24 +++++++++++--- sources | 1 + 7 files changed, 116 insertions(+), 12 deletions(-) create mode 100644 hplip-3.10.2.tar.gz.asc delete mode 100644 hplip-3.9.12.tar.gz.asc create mode 100644 hplip-mucks-with-spooldir.patch create mode 100644 hplip-pstotiff-is-rubbish.patch diff --git a/.cvsignore b/.cvsignore index 21c6c76..9d80519 100644 --- a/.cvsignore +++ b/.cvsignore @@ -32,3 +32,4 @@ hplip-3.9.6b.tar.gz hplip-3.9.8.tar.gz hplip-3.9.10.tar.gz hplip-3.9.12.tar.gz +hplip-3.10.2.tar.gz diff --git a/hplip-3.10.2.tar.gz.asc b/hplip-3.10.2.tar.gz.asc new file mode 100644 index 0000000..a227003 --- /dev/null +++ b/hplip-3.10.2.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkuFslQACgkQc9dwzaWQR7mpowCgr3YlpISS+6eqBhwkTIdOhc3b +470An0hYImtLZznLX6oljo/gw4zCoqvh +=dMK4 +-----END PGP SIGNATURE----- diff --git a/hplip-3.9.12.tar.gz.asc b/hplip-3.9.12.tar.gz.asc deleted file mode 100644 index 36aaec5..0000000 --- a/hplip-3.9.12.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAksn/zgACgkQc9dwzaWQR7nJUACgrL1YrF8ct7EEdAvDwhcsRHxi -Da4AnjHpD5VB3wwqYDEQp6Z0xGqDOhfO -=+b+Q ------END PGP SIGNATURE----- diff --git a/hplip-mucks-with-spooldir.patch b/hplip-mucks-with-spooldir.patch new file mode 100644 index 0000000..d110ce7 --- /dev/null +++ b/hplip-mucks-with-spooldir.patch @@ -0,0 +1,30 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir 2010-02-26 12:07:47.170265651 +0000 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-02-26 12:09:13.647265807 +0000 +@@ -443,26 +443,6 @@ int HPCupsFilter::StartPrintJob(int arg + + getLogLevel(); + m_JA.job_id = atoi(argv[1]); +- FILE *fp; +- char dFileName[32]; +- memset(dFileName, 0, sizeof(dFileName)); +- m_JA.job_id = atoi(argv[1]); +- snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); +- if ((fp = fopen (dFileName, "r"))) +- { +- char line[258]; +- for (int i = 0; i < 10; i++) +- { +- fgets (line, 256, fp); +- if (!strncmp (line, "%%Pages:", 8)) +- { +- sscanf (line+9, "%d", &m_JA.total_pages); +- break; +- } +- } +- fclose (fp); +- } +- + m_ppd = ppdOpenFile(getenv("PPD")); + if (m_ppd == NULL) { + dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD")); diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch new file mode 100644 index 0000000..9db74e2 --- /dev/null +++ b/hplip-pstotiff-is-rubbish.patch @@ -0,0 +1,58 @@ +diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff +--- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-26 12:05:42.883265245 +0000 ++++ hplip-3.10.2/fax/filters/pstotiff 2010-02-26 12:06:06.546266294 +0000 +@@ -1,43 +1,11 @@ +-#!/usr/bin/env python +- +-import os +-import os.path +-import time +-import sys +-import tempfile +- +-READ_SIZE = 8192 +- +-total_bytes_read = 0 +-temp_in_file = "-" +- +-if (len(sys.argv) > 6): +- temp_in_file = sys.argv[6] +- +-temp_out_handle, temp_out_fname = tempfile.mkstemp() +- +-font = "-I/usr/share/cups/fonts" +-device = "-sDEVICE=tiffg4 -dDEBUG -dNOPAUSE -dBATCH -dSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +- +-gs_command = "/usr/bin/gs" + " " + font + " " + device +- +-exit_code = os.system(gs_command) +-#if exit_code != 0: +-# print("Ghostscript returned error (error code %d)!" % exit_code) +-# sys.exit(exit_code) +- +-file_len = os.stat(temp_out_fname).st_size +-if (file_len < READ_SIZE): +- READ_SIZE = file_len +- +-os.close(temp_out_handle) +- +-out_handle = open(temp_out_fname, mode='rb') +-while (total_bytes_read < file_len): +- data = out_handle.read(READ_SIZE) +- sys.stdout.write(data) +- total_bytes_read += READ_SIZE +-out_handle.close() +- +-os.remove(temp_out_fname) +-sys.exit(0) ++#!/bin/sh ++if [ $# -lt 6 ]; then ++ IN=-_ ++else ++ IN="$6" ++fi ++ ++gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \ ++ -dSAFER -dPARANOIDSAFER \ ++ -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ ++ -sstdout=%stderr -sOutputFile=- "$IN" diff --git a/hplip.spec b/hplip.spec index 9a7880b..cbb7d97 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.9.12 -Release: 8%{?dist} +Version: 3.10.2 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,11 +13,12 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz -Patch1: hplip-preferences-crash.patch +Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch Patch5: hplip-device-ids.patch +Patch6: hplip-mucks-with-spooldir.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -114,8 +115,8 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q -# Fixed crash when using Preferences dialog (bug #555979). -%patch1 -p1 -b .preferences-crash +# The pstotiff filter is rubbish so replace it (launchpad #528394). +%patch1 -p1 -b .pstotiff-is-rubbish # Fix compilation. %patch2 -p1 -b .strstr-const @@ -129,6 +130,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Corrected several IEEE 1284 Device IDs using foomatic data. %patch5 -p1 -b .device-ids +# Stopped hpcups pointlessly trying to read spool files +# directly (bug #552572). +%patch6 -p1 -b .mucks-with-spooldir + # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -208,6 +213,7 @@ rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc rm -f %{buildroot}%{_datadir}/hplip/hplip-install rm -rf %{buildroot}%{_datadir}/hplip/install.* rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template +rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types # The systray applet doesn't work properly (displays icon as a # window), so don't ship the launcher yet. @@ -248,6 +254,8 @@ rm -rf %{buildroot} # CUPS serverbin directory. /usr/lib/cups/backend/hp /usr/lib/cups/backend/hpfax +/usr/lib/cups/filter/pstotiff +%{_datadir}/cups/mime/pstotiff.convs # Files %{_datadir}/hplip/align.py* %{_datadir}/hplip/clean.py* @@ -354,6 +362,12 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Fri Feb 26 2010 Tim Waugh - 3.10.2-1 +- 3.10.2. No longer need preferences-crash patch. +- The pstotiff filter is rubbish so replace it (launchpad #528394). +- Stopped hpcups pointlessly trying to read spool files + directly (bug #552572). + * Sat Feb 20 2010 Tim Waugh - 3.9.12-8 - Corrected several IEEE 1284 Device IDs using foomatic data (launchpad bug #523259). diff --git a/sources b/sources index 1c45967..373fe8a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 2b0906b4a57b437988829557ca62adfd hplip-3.9.12.tar.gz +4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz From 69c6f2f353019b56ad9913817af03171c55cb4b5 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 26 Feb 2010 15:45:55 +0000 Subject: [PATCH 24/69] - 3.10.2. No longer need preferences-crash patch. - The pstotiff filter is rubbish so replace it (launchpad #528394). - Stopped hpcups pointlessly trying to read spool files directly (bug #552572). --- .cvsignore | 1 + hplip-3.10.2.tar.gz.asc | 7 + hplip-3.9.8.tar.gz.asc | 7 - hplip-clear-previous-state-reasons.patch | 29 - hplip-device-ids.patch | 1272 ++++++++++++++++ hplip-device-reconnected.patch | 35 +- hplip-hpcups-plugin.patch | 318 ---- hplip-hpcups-reorder.patch | 1674 ---------------------- hplip-mucks-with-spooldir.patch | 30 + hplip-parenths.patch | 183 --- hplip-plugin-error.patch | 23 - hplip-preferences-crash.patch | 14 - hplip-pstotiff-is-rubbish.patch | 58 + hplip-requirespageregion.patch | 12 - hplip-retry-open.patch | 34 +- hplip-state-reasons-newline.patch | 36 - hplip.spec | 95 +- sources | 2 +- 18 files changed, 1448 insertions(+), 2382 deletions(-) create mode 100644 hplip-3.10.2.tar.gz.asc delete mode 100644 hplip-3.9.8.tar.gz.asc delete mode 100644 hplip-clear-previous-state-reasons.patch create mode 100644 hplip-device-ids.patch delete mode 100644 hplip-hpcups-plugin.patch delete mode 100644 hplip-hpcups-reorder.patch create mode 100644 hplip-mucks-with-spooldir.patch delete mode 100644 hplip-parenths.patch delete mode 100644 hplip-plugin-error.patch delete mode 100644 hplip-preferences-crash.patch create mode 100644 hplip-pstotiff-is-rubbish.patch delete mode 100644 hplip-requirespageregion.patch delete mode 100644 hplip-state-reasons-newline.patch diff --git a/.cvsignore b/.cvsignore index efb4cf1..978ed68 100644 --- a/.cvsignore +++ b/.cvsignore @@ -30,3 +30,4 @@ hplip-2.8.12.tar.gz hplip-3.9.2.tar.gz hplip-3.9.6b.tar.gz hplip-3.9.8.tar.gz +hplip-3.10.2.tar.gz diff --git a/hplip-3.10.2.tar.gz.asc b/hplip-3.10.2.tar.gz.asc new file mode 100644 index 0000000..a227003 --- /dev/null +++ b/hplip-3.10.2.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkuFslQACgkQc9dwzaWQR7mpowCgr3YlpISS+6eqBhwkTIdOhc3b +470An0hYImtLZznLX6oljo/gw4zCoqvh +=dMK4 +-----END PGP SIGNATURE----- diff --git a/hplip-3.9.8.tar.gz.asc b/hplip-3.9.8.tar.gz.asc deleted file mode 100644 index 1e975ad..0000000 --- a/hplip-3.9.8.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp4q+sACgkQhA7anpATwAWrnwCeNjw4P14Md8GsBRtbgLo+Hr6M -nwMAoJoSt8h4xjpXdmEWuhoFie0drfBT -=pkCz ------END PGP SIGNATURE----- diff --git a/hplip-clear-previous-state-reasons.patch b/hplip-clear-previous-state-reasons.patch deleted file mode 100644 index ed2b4ec..0000000 --- a/hplip-clear-previous-state-reasons.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons 2009-08-04 22:35:33.000000000 +0100 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-08-24 09:55:28.941900902 +0100 -@@ -570,6 +570,14 @@ static int loop_test(HPMUD_DEVICE dd, HP - { - int status, stat; - const char *pstate, *old_state=NULL; -+ static int first_time = 1; -+ -+ if (first_time) -+ { -+ first_time = 0; -+ old_state = ("media-empty-error,media-jam-error," -+ "cover-open-error,toner-empty-error,other"); -+ } - - while (1) - { -@@ -768,6 +776,10 @@ int main(int argc, char *argv[]) - pthread_cond_init(&pa.done_cond, NULL); - pthread_create(&pa.tid, NULL, (void *(*)(void*))pjl_read_thread, (void *)&pa); - } -+ -+ /* Clear any errors left over from a previous run. */ -+ loop_test (hd, cd, &pa, argv[0], printer, argv[2], argv[1], -+ argv[3]); - } - - stat = hpmud_write_channel(hd, cd, buf+total, size, EXCEPTION_TIMEOUT, &n); diff --git a/hplip-device-ids.patch b/hplip-device-ids.patch new file mode 100644 index 0000000..9f52a6d --- /dev/null +++ b/hplip-device-ids.patch @@ -0,0 +1,1272 @@ +diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hpcups.drv.in +--- hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids 2010-02-20 11:18:12.473921525 +0000 ++++ hplip-3.9.12/prnt/drv/hpcups.drv.in 2010-02-20 14:44:58.326282207 +0000 +@@ -401,7 +401,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + Attribute "NickName" "" "HP Officejet v40xi, $Version" + Attribute "ShortNickName" "" "HP Officejet v40xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40xi.ppd" + Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" + } +@@ -409,7 +409,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + Attribute "NickName" "" "HP Officejet v40, $Version" + Attribute "ShortNickName" "" "HP Officejet v40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40.ppd" + Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" +@@ -426,7 +426,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + Attribute "NickName" "" "HP Officejet g55, $Version" + Attribute "ShortNickName" "" "HP Officejet g55" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g55.ppd" + Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" + } +@@ -474,7 +474,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + Attribute "NickName" "" "HP Officejet g85, $Version" + Attribute "ShortNickName" "" "HP Officejet g85" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g85.ppd" + Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" + } +@@ -490,7 +490,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + Attribute "NickName" "" "HP Officejet g95, $Version" + Attribute "ShortNickName" "" "HP Officejet g95" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g95.ppd" + Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" + } +@@ -506,7 +506,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + Attribute "NickName" "" "HP PSC 750xi, $Version" + Attribute "ShortNickName" "" "HP PSC 750xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750xi.ppd" + Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" + } +@@ -514,7 +514,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + Attribute "NickName" "" "HP PSC 750, $Version" + Attribute "ShortNickName" "" "HP PSC 750" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750.ppd" + Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" + } +@@ -546,7 +546,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + Attribute "NickName" "" "HP PSC 900 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 900 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" + PCFileName "hp-psc_900_series.ppd" + Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" + } +@@ -562,7 +562,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 920c" + Attribute "NickName" "" "HP Deskjet 920c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 920c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" + PCFileName "hp-deskjet_920c.ppd" + Attribute "Product" "" "(HP Deskjet 920c Printer)" + Attribute "Product" "" "(HP Deskjet 920cvr Printer)" +@@ -581,7 +581,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 930c" + Attribute "NickName" "" "HP Deskjet 930c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 930c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" + PCFileName "hp-deskjet_930c.ppd" + Attribute "Product" "" "(HP Deskjet 930c Printer)" + Attribute "Product" "" "(HP Deskjet 930cm Printer)" +@@ -622,7 +622,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 940c" + Attribute "NickName" "" "HP Deskjet 940c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 940c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" + PCFileName "hp-deskjet_940c.ppd" + Attribute "Product" "" "(HP Deskjet 940cvr Printer)" + Attribute "Product" "" "(HP Deskjet 940c Printer)" +@@ -641,7 +641,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 950c" + Attribute "NickName" "" "HP Deskjet 950c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 950c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_950c.ppd" + Attribute "Product" "" "(HP Deskjet 950c Printer)" + } +@@ -706,7 +706,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 970c" + Attribute "NickName" "" "HP Deskjet 970c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 970c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" + PCFileName "hp-deskjet_970c.ppd" + Attribute "Product" "" "(HP Deskjet 970cxi Printer)" + Attribute "Product" "" "(HP Deskjet 970cse Printer)" +@@ -726,7 +726,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1000" + Attribute "NickName" "" "HP Photosmart p1000, $Version" + Attribute "ShortNickName" "" "HP Photosmart p1000" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" + PCFileName "hp-photosmart_p1000.ppd" + Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" + Attribute "Product" "" "(HP Photosmart p1000xi Printer)" +@@ -735,7 +735,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1100" + Attribute "NickName" "" "HP Photosmart p1100, $Version" + Attribute "ShortNickName" "" "HP Photosmart p1100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" + PCFileName "hp-photosmart_p1100.ppd" + Attribute "Product" "" "(HP Photosmart p1100 Printer)" + Attribute "Product" "" "(HP Photosmart p1100xi Printer)" +@@ -769,7 +769,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3820" + Attribute "NickName" "" "HP Deskjet 3820, $Version" + Attribute "ShortNickName" "" "HP Deskjet 3820" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;" + PCFileName "hp-deskjet_3820.ppd" + Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" +@@ -807,7 +807,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5105" + Attribute "NickName" "" "HP Officejet 5105, $Version" + Attribute "ShortNickName" "" "HP Officejet 5105" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5105.ppd" + Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" + } +@@ -815,7 +815,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5110v" + Attribute "NickName" "" "HP Officejet 5110v, $Version" + Attribute "ShortNickName" "" "HP Officejet 5110v" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5110v.ppd" + Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" + } +@@ -866,7 +866,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 1220c" + Attribute "NickName" "" "HP Deskjet 1220c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 1220c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;" + PCFileName "hp-deskjet_1220c.ppd" + Attribute "Product" "" "(HP Deskjet 1220c Printer)" + Attribute "Product" "" "(HP Deskjet 1220cse Printer)" +@@ -1062,7 +1062,7 @@ Manufacturer "HP" + ModelName "HP 2000c" + Attribute "NickName" "" "HP 2000c, $Version" + Attribute "ShortNickName" "" "HP 2000c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;" + PCFileName "hp-2000c.ppd" + Attribute "Product" "" "(HP 2000cse Printer)" + Attribute "Product" "" "(HP 2000c Printer)" +@@ -1504,7 +1504,7 @@ Manufacturer "HP" + ModelName "HP Officejet D Series" + Attribute "NickName" "" "HP Officejet D Series, $Version" + Attribute "ShortNickName" "" "HP Officejet D Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" + PCFileName "hp-officejet_d_series.ppd" + Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" + Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" +@@ -1527,7 +1527,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 960c" + Attribute "NickName" "" "HP Deskjet 960c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 960c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;" + PCFileName "hp-deskjet_960c.ppd" + Attribute "Product" "" "(HP Deskjet 960cse Printer)" + Attribute "Product" "" "(HP Deskjet 960cxi Printer)" +@@ -1537,7 +1537,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 980c" + Attribute "NickName" "" "HP Deskjet 980c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 980c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;" + PCFileName "hp-deskjet_980c.ppd" + Attribute "Product" "" "(HP Deskjet 980cxi Printer)" + Attribute "Product" "" "(HP Deskjet 980c Printer)" +@@ -1546,7 +1546,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 990c" + Attribute "NickName" "" "HP Deskjet 990c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 990c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;" + PCFileName "hp-deskjet_990c.ppd" + Attribute "Product" "" "(HP Deskjet 990cxi Printer)" + Attribute "Product" "" "(HP Deskjet 990cse Printer)" +@@ -1609,7 +1609,7 @@ Manufacturer "HP" + ModelName "HP Color Inkjet cp1700" + Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" + Attribute "ShortNickName" "" "HP Color Inkjet cp1700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" + PCFileName "hp-color_inkjet_cp1700.ppd" + Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" + } +@@ -1617,7 +1617,7 @@ Manufacturer "HP" + ModelName "HP PSC 2100 Series" + Attribute "NickName" "" "HP PSC 2100 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" + PCFileName "hp-psc_2100_series.ppd" + Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" +@@ -1630,7 +1630,7 @@ Manufacturer "HP" + ModelName "HP PSC 2150 Series" + Attribute "NickName" "" "HP PSC 2150 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" + PCFileName "hp-psc_2150_series.ppd" + Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" + } +@@ -1638,7 +1638,7 @@ Manufacturer "HP" + ModelName "HP PSC 2170 Series" + Attribute "NickName" "" "HP PSC 2170 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2170 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" + PCFileName "hp-psc_2170_series.ppd" + Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" +@@ -1675,7 +1675,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7100 Series" + Attribute "NickName" "" "HP Officejet 7100 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;" + PCFileName "hp-officejet_7100_series.ppd" + Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" +@@ -1905,7 +1905,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2200" + Attribute "NickName" "" "HP Business Inkjet 2200, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;" + PCFileName "hp-business_inkjet_2200.ppd" + Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" +@@ -1915,7 +1915,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2230" + Attribute "NickName" "" "HP Business Inkjet 2230, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2230" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;" + PCFileName "hp-business_inkjet_2230.ppd" + Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" + } +@@ -1923,7 +1923,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2250" + Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2250" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;" + PCFileName "hp-business_inkjet_2250-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" +@@ -1932,7 +1932,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2280" + Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2280" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;" + PCFileName "hp-business_inkjet_2280-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" +@@ -2471,7 +2471,7 @@ Manufacturer "HP" + ModelName "HP PSC 1600 Series" + Attribute "NickName" "" "HP PSC 1600 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1600 series;DES:psc 1600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1600 series;DES:psc 1600 series;" + PCFileName "hp-psc_1600_series.ppd" + Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" +@@ -2487,7 +2487,7 @@ Manufacturer "HP" + ModelName "HP PSC 2200 Series" + Attribute "NickName" "" "HP PSC 2200 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" + PCFileName "hp-psc_2200_series.ppd" + Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" + } +@@ -2505,7 +2505,7 @@ Manufacturer "HP" + ModelName "HP PSC 2300 Series" + Attribute "NickName" "" "HP PSC 2300 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" + PCFileName "hp-psc_2300_series.ppd" + Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" +@@ -2514,7 +2514,7 @@ Manufacturer "HP" + ModelName "HP PSC 2350 Series" + Attribute "NickName" "" "HP PSC 2350 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2350 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" + PCFileName "hp-psc_2350_series.ppd" + Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" +@@ -2531,7 +2531,7 @@ Manufacturer "HP" + ModelName "HP PSC 2400 Series" + Attribute "NickName" "" "HP PSC 2400 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2400 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2400 Series;DES:psc 2400 series;" + PCFileName "hp-psc_2400_series.ppd" + Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" +@@ -2557,7 +2557,7 @@ Manufacturer "HP" + ModelName "HP PSC 2500 Series" + Attribute "NickName" "" "HP PSC 2500 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2500 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" + PCFileName "hp-psc_2500_series.ppd" + Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" +@@ -3032,7 +3032,7 @@ Manufacturer "HP" + ModelName "HP Officejet j5700 Series" + Attribute "NickName" "" "HP Officejet j5700 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet j5700 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" + PCFileName "hp-officejet_j5700_series.ppd" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" +@@ -3121,7 +3121,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6100 Series" + Attribute "NickName" "" "HP Officejet 6100 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 6100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" + PCFileName "hp-officejet_6100_series.ppd" + Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" +@@ -3190,7 +3190,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6300 Series" + Attribute "NickName" "" "HP Officejet 6300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 6300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6300 series;DES:officejet 6300 series;" + PCFileName "hp-officejet_6300_series.ppd" + Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" +@@ -3377,7 +3377,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7200 Series" + Attribute "NickName" "" "HP Officejet 7200 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;" + PCFileName "hp-officejet_7200_series.ppd" + Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" +@@ -3414,7 +3414,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7300 Series" + Attribute "NickName" "" "HP Officejet 7300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7300 series;DES:officejet 7300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7300 series;DES:officejet 7300 series;" + PCFileName "hp-officejet_7300_series.ppd" + Attribute "Product" "" "(HP Officejet 7310 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7310xi All-in-one Printer)" +@@ -3462,7 +3462,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7400 Series" + Attribute "NickName" "" "HP Officejet 7400 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 7400 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;" + PCFileName "hp-officejet_7400_series.ppd" + Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" +@@ -5273,7 +5273,7 @@ Manufacturer "HP" + ModelName "HP PSC 1100 Series" + Attribute "NickName" "" "HP PSC 1100 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" + PCFileName "hp-psc_1100_series.ppd" + Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" +@@ -5283,7 +5283,7 @@ Manufacturer "HP" + ModelName "HP PSC 1200 Series" + Attribute "NickName" "" "HP PSC 1200 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" + PCFileName "hp-psc_1200_series.ppd" + Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" +@@ -5475,7 +5475,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4100 Series" + Attribute "NickName" "" "HP Officejet 4100 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 4100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;" + PCFileName "hp-officejet_4100_series.ppd" + Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" +@@ -5502,7 +5502,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4300 Series" + Attribute "NickName" "" "HP Officejet 4300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 4300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;" + PCFileName "hp-officejet_4300_series.ppd" + Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" +@@ -5800,7 +5800,7 @@ Manufacturer "HP" + ModelName "HP Officejet j3600 Series" + Attribute "NickName" "" "HP Officejet j3600 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet j3600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" + PCFileName "hp-officejet_j3600_series.ppd" + Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" +@@ -5871,7 +5871,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4200 Series" + Attribute "NickName" "" "HP Officejet 4200 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 4200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;" + PCFileName "hp-officejet_4200_series.ppd" + Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" +@@ -6835,7 +6835,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4 Plus" + Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4 Plus" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4 plus;DES:hp laserjet 4 plus;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;DES:hp laserjet 4 plus;" + PCFileName "hp-laserjet_4_plus-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" + Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" +@@ -6861,7 +6861,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5mp" + Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" + PCFileName "hp-laserjet_5mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5mp Printer)" + } +@@ -6869,7 +6869,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5l" + Attribute "NickName" "" "HP LaserJet 5l, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5l" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5l;DES:hp laserjet 5l;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;" + PCFileName "hp-laserjet_5l.ppd" + Attribute "Product" "" "(HP LaserJet 5l Printer)" + Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" +@@ -6879,7 +6879,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5p" + Attribute "NickName" "" "HP LaserJet 5p, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5p" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5p;DES:hp laserjet 5p;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;" + PCFileName "hp-laserjet_5p.ppd" + Attribute "Product" "" "(HP LaserJet 5p Printer)" + } +@@ -6887,7 +6887,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6l" + Attribute "NickName" "" "HP LaserJet 6l, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6l" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6l;DES:hp laserjet 6l;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:hp laserjet 6l;" + PCFileName "hp-laserjet_6l.ppd" + Attribute "Product" "" "(HP LaserJet 6l Printer)" + Attribute "Product" "" "(HP LaserJet 6lse Printer)" +@@ -6899,7 +6899,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6p" + Attribute "NickName" "" "HP LaserJet 6p, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6p" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6p;DES:hp laserjet 6p;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;" + PCFileName "hp-laserjet_6p.ppd" + Attribute "Product" "" "(HP LaserJet 6p Printer)" + } +@@ -6907,7 +6907,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6mp" + Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6mp;DES:hp laserjet 6mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;" + PCFileName "hp-laserjet_6mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 6mp Printer)" + Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" +@@ -6917,7 +6917,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1015" + Attribute "NickName" "" "HP LaserJet 1015, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1015" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1015;DES:hp laserjet 1015;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1015;DES:hp laserjet 1015;" + PCFileName "hp-laserjet_1015.ppd" + Attribute "Product" "" "(HP LaserJet 1015 Printer)" + } +@@ -6959,7 +6959,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1100" + Attribute "NickName" "" "HP LaserJet 1100, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1100;DES:hp laserjet 1100;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;" + PCFileName "hp-laserjet_1100.ppd" + Attribute "Product" "" "(HP LaserJet 1100 Printer)" + Attribute "Product" "" "(HP LaserJet 1100se Printer)" +@@ -6977,7 +6977,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1150" + Attribute "NickName" "" "HP LaserJet 1150, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1150" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1150;DES:hp laserjet 1150;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;" + PCFileName "hp-laserjet_1150.ppd" + Attribute "Product" "" "(HP LaserJet 1150 Printer)" + } +@@ -6994,7 +6994,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1160 Series" + Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1160 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1160 series;DES:hp laserjet 1160 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;" + PCFileName "hp-laserjet_1160_series.ppd" + Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" + } +@@ -7002,7 +7002,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1200" + Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1200;DES:hp laserjet 1200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:hp laserjet 1200;" + PCFileName "hp-laserjet_1200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1200 Printer)" + Attribute "Product" "" "(HP LaserJet 1200se Printer)" +@@ -7027,7 +7027,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1220" + Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1220" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1220;DES:hp laserjet 1220;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;" + PCFileName "hp-laserjet_1220-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" + } +@@ -7035,7 +7035,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1300" + Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1300;DES:hp laserjet 1300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" + PCFileName "hp-laserjet_1300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1300 Printer)" + Attribute "Product" "" "(HP LaserJet 1300t Printer)" +@@ -7060,7 +7060,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1320 Series" + Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1320 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320 series;DES:hp laserjet 1320 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + PCFileName "hp-laserjet_1320_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" + } +@@ -7157,7 +7157,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p2015 Series" + Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p2015 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2015 series;DES:hp laserjet p2015 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + PCFileName "hp-laserjet_p2015_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p2015 Printer)" + } +@@ -7233,7 +7233,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2100 Series" + Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100 series;DES:hp laserjet 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;" + PCFileName "hp-laserjet_2100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" + } +@@ -7249,7 +7249,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2200" + Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200;DES:hp laserjet 2200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" + PCFileName "hp-laserjet_2200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2200 Printer)" + Attribute "Product" "" "(HP LaserJet 2200d Printer)" +@@ -7275,7 +7275,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2300 Series" + Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300 series;DES:hp laserjet 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" + PCFileName "hp-laserjet_2300_series.ppd" + Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" + } +@@ -7291,7 +7291,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2420" + Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2420" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2420;DES:hp laserjet 2420;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;" + PCFileName "hp-laserjet_2420-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2420 Printer)" + Attribute "Product" "" "(HP LaserJet 2420d Printer)" +@@ -7302,7 +7302,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2430" + Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2430" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2430;DES:hp laserjet 2430;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;" + PCFileName "hp-laserjet_2430-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2430t Printer)" + Attribute "Product" "" "(HP LaserJet 2430 Printer)" +@@ -7352,7 +7352,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3015" + Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3015" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3015;DES:hp laserjet 3015;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;" + PCFileName "hp-laserjet_3015-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" + } +@@ -7360,7 +7360,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3020" + Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3020" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3020;DES:hp laserjet 3020;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;" + PCFileName "hp-laserjet_3020-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" + } +@@ -7368,7 +7368,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m3027 MFP" + Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3027 mfp;DES:hp laserjet m3027 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;DES:Hewlett-Packard LaserJet M3027 MFP;" + PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" +@@ -7377,7 +7377,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3030" + Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3030" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3030;DES:hp laserjet 3030;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;" + PCFileName "hp-laserjet_3030-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" + } +@@ -7385,7 +7385,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3050" + Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3050" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3050;DES:hp laserjet 3050;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;" + PCFileName "hp-laserjet_3050-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" + Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" +@@ -7394,7 +7394,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3052" + Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3052" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3052;DES:hp laserjet 3052;" ++ Attribute "1284DeviceID" "" "MFG:HEwlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;" + PCFileName "hp-laserjet_3052-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" + } +@@ -7402,7 +7402,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3055" + Attribute "NickName" "" "HP LaserJet 3055, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3055" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3055;DES:hp laserjet 3055;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;" + PCFileName "hp-laserjet_3055.ppd" + Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" + } +@@ -7430,7 +7430,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3200m" + Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3200m" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200m;DES:hp laserjet 3200m;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;" + PCFileName "hp-laserjet_3200m-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" + } +@@ -7446,7 +7446,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3200" + Attribute "NickName" "" "HP LaserJet 3200, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200;DES:hp laserjet 3200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;" + PCFileName "hp-laserjet_3200.ppd" + Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" + } +@@ -7466,7 +7466,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3330" + Attribute "NickName" "" "HP LaserJet 3330, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3330" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3330;DES:hp laserjet 3330;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;" + PCFileName "hp-laserjet_3330.ppd" + Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" + } +@@ -7474,7 +7474,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3380" + Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3380" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3380;DES:hp laserjet 3380;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;" + PCFileName "hp-laserjet_3380-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" + } +@@ -7482,7 +7482,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3390" + Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3390" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3390;DES:hp laserjet 3390;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" + PCFileName "hp-laserjet_3390-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" + } +@@ -7498,7 +7498,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4000 Series" + Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4000 series;DES:hp laserjet 4000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;" + PCFileName "hp-laserjet_4000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4000 Printer)" + Attribute "Product" "" "(HP LaserJet 4000n Printer)" +@@ -7574,7 +7574,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4050 Series" + Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4050 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4050 series;DES:hp laserjet 4050 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series;DES:Hewlett-Packard LaserJet 4050 Series;" + PCFileName "hp-laserjet_4050_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4050 Printer)" + Attribute "Product" "" "(HP LaserJet 4050n Printer)" +@@ -7586,7 +7586,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4100 Series" + Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4100 series;DES:hp laserjet 4100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series;DES:Hewlett-Packard LaserJet 4100 Series;" + PCFileName "hp-laserjet_4100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 410dtn Printer)" + Attribute "Product" "" "(HP LaserJet 4100tn Printer)" +@@ -7614,7 +7614,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4200" + Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4200;DES:hp laserjet 4200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;" + PCFileName "hp-laserjet_4200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4200 Printer)" + Attribute "Product" "" "(HP LaserJet 4200l Printer)" +@@ -7639,7 +7639,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4250" + Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4250" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4250;DES:hp laserjet 4250;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" + PCFileName "hp-laserjet_4250-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4250 Printer)" + Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" +@@ -7651,7 +7651,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4300" + Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4300;DES:hp laserjet 4300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;DES:hp laserjet 4300;" + PCFileName "hp-laserjet_4300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4300 Printer)" + Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" +@@ -7664,7 +7664,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4345 MFP" + Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4345 mfp;DES:hp laserjet 4345 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4345 mfp;DES:hp laserjet 4345 mfp;" + PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" +@@ -7675,7 +7675,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m4345 MFP" + Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m4345 mfp;DES:hp laserjet m4345 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M4345 MFP;DES:Hewlett-Packard LaserJet M4345 MFP;" + PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" +@@ -7746,7 +7746,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5000 Series" + Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5000 series;DES:hp laserjet 5000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;" + PCFileName "hp-laserjet_5000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" + } +@@ -7856,7 +7856,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5si" + Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5si" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5si;DES:hp laserjet 5si;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:;" + PCFileName "hp-laserjet_5si-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5si Printer)" + Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" +@@ -7892,7 +7892,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m3035 MFP" + Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3035 mfp;DES:hp laserjet m3035 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;DES:Hewlett-Packard LaserJet M3035 MFP;" + PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" +@@ -7913,7 +7913,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m5025 MFP" + Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5025 mfp;DES:hp laserjet m5025 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5025 MFP;DES:Hewlett-Packard LaserJet M5025 MFP;" + PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" + } +@@ -7921,7 +7921,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m5035 MFP" + Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5035 mfp;DES:hp laserjet m5035 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5035 MFP;DES:Hewlett-Packard LaserJet M5035 MFP;" + PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" +@@ -7982,7 +7982,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8150 Series" + Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8150 series;DES:hp laserjet 8150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;" + PCFileName "hp-laserjet_8150_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 8150 Printer)" + Attribute "Product" "" "(HP LaserJet 8150n Printer)" +@@ -8259,7 +8259,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2300" + Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" + PCFileName "hp-business_inkjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" +@@ -8428,7 +8428,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4550" + Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550;DES:Hewlett-Packard Color LaserJet 4550;" + PCFileName "hp-color_laserjet_4550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" +@@ -8441,7 +8441,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4600 Series" + Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" + PCFileName "hp-color_laserjet_4600_series.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" +@@ -8539,7 +8539,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet 9100 Series" + Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Officejet 9100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" + PCFileName "hp-officejet_9100_series-pcl3.ppd" + Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" +@@ -8580,7 +8580,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2800" + Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2800" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;" + PCFileName "hp-business_inkjet_2800-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" +@@ -8872,7 +8872,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1010" + Attribute "NickName" "" "HP LaserJet 1010, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1010" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1010;DES:hp laserjet 1010;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1010;DES:Hewlett-Packard LaserJet 1010;" + PCFileName "hp-laserjet_1010.ppd" + Attribute "Product" "" "(HP LaserJet 1010 Printer)" + } +@@ -8880,7 +8880,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1012" + Attribute "NickName" "" "HP LaserJet 1012, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1012" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1012;DES:hp laserjet 1012;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1012;DES:hp laserjet 1012;" + PCFileName "hp-laserjet_1012.ppd" + Attribute "Product" "" "(HP LaserJet 1012 Printer)" + } +@@ -9088,7 +9088,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Lx" + Attribute "NickName" "" "HP Officejet Lx, $Version" + Attribute "ShortNickName" "" "HP Officejet Lx" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;" + PCFileName "hp-officejet_lx.ppd" + Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" + } +@@ -9252,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 300" + Attribute "NickName" "" "HP Officejet Series 300, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" + PCFileName "hp-officejet_series_300.ppd" + Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" + } +@@ -9276,7 +9276,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 400" + Attribute "NickName" "" "HP Deskjet 400, $Version" + Attribute "ShortNickName" "" "HP Deskjet 400" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" + PCFileName "hp-deskjet_400.ppd" + Attribute "Product" "" "(HP Deskjet 400 Printer)" + Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" +@@ -9293,7 +9293,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 540" + Attribute "NickName" "" "HP Deskjet 540, $Version" + Attribute "ShortNickName" "" "HP Deskjet 540" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;" + PCFileName "hp-deskjet_540.ppd" + Attribute "Product" "" "(HP Deskjet 540 Printer)" + } +@@ -9418,7 +9418,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 630c" + Attribute "NickName" "" "HP Deskjet 630c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 630c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;" + PCFileName "hp-deskjet_630c.ppd" + Attribute "Product" "" "(HP Deskjet 630c Printer)" + } +@@ -9434,7 +9434,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 656c" + Attribute "NickName" "" "HP Deskjet 656c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 656c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;" + PCFileName "hp-deskjet_656c.ppd" + Attribute "Product" "" "(HP Deskjet 656c Printer)" + Attribute "Product" "" "(HP Deskjet 656cvr Printer)" +@@ -9547,7 +9547,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 600" + Attribute "NickName" "" "HP Deskjet 600, $Version" + Attribute "ShortNickName" "" "HP Deskjet 600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;" + PCFileName "hp-deskjet_600.ppd" + Attribute "Product" "" "(HP Deskjet 600c Printer)" + Attribute "Product" "" "(HP Deskjet 600 Printer)" +@@ -9569,7 +9569,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 500" + Attribute "NickName" "" "HP Officejet Series 500, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 500;DES:officejet series 500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 500;DES:officejet series 500;" + PCFileName "hp-officejet_series_500.ppd" + Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" + } +@@ -9609,7 +9609,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 600" + Attribute "NickName" "" "HP Officejet Series 600, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;" + PCFileName "hp-officejet_series_600.ppd" + Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" + } +@@ -9661,7 +9661,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 670c" + Attribute "NickName" "" "HP Deskjet 670c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 670c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" + PCFileName "hp-deskjet_670c.ppd" + Attribute "Product" "" "(HP Deskjet 670c)" + } +@@ -9813,7 +9813,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 610c" + Attribute "NickName" "" "HP Deskjet 610c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 610c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;" + PCFileName "hp-deskjet_610c.ppd" + Attribute "Product" "" "(HP Deskjet 610c Printer)" + } +@@ -9837,7 +9837,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 640c" + Attribute "NickName" "" "HP Deskjet 640c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 640c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;" + PCFileName "hp-deskjet_640c.ppd" + Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" + Attribute "Product" "" "(HP Deskjet 640c Printer)" +@@ -9857,7 +9857,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 690c" + Attribute "NickName" "" "HP Deskjet 690c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 690c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;" + PCFileName "hp-deskjet_690c.ppd" + Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" + Attribute "Product" "" "(HP Deskjet 690c Printer)" +@@ -9917,7 +9917,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 700" + Attribute "NickName" "" "HP Officejet Series 700, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;" + PCFileName "hp-officejet_series_700.ppd" + Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" + } +@@ -10060,7 +10060,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet T Series" + Attribute "NickName" "" "HP Officejet T Series, $Version" + Attribute "ShortNickName" "" "HP Officejet T Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" + PCFileName "hp-officejet_t_series.ppd" + Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" +@@ -10071,7 +10071,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r40" + Attribute "NickName" "" "HP Officejet r40, $Version" + Attribute "ShortNickName" "" "HP Officejet r40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" + PCFileName "hp-officejet_r40.ppd" + Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" + } +@@ -10095,7 +10095,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r60" + Attribute "NickName" "" "HP Officejet r60, $Version" + Attribute "ShortNickName" "" "HP Officejet r60" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" + PCFileName "hp-officejet_r60.ppd" + Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" + } +@@ -10103,7 +10103,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r65" + Attribute "NickName" "" "HP Officejet r65, $Version" + Attribute "ShortNickName" "" "HP Officejet r65" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" + PCFileName "hp-officejet_r65.ppd" + Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" + } +@@ -10119,7 +10119,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r80" + Attribute "NickName" "" "HP Officejet r80, $Version" + Attribute "ShortNickName" "" "HP Officejet r80" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" + PCFileName "hp-officejet_r80.ppd" + Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" + } +@@ -10127,7 +10127,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP PSC 500" + Attribute "NickName" "" "HP PSC 500, $Version" + Attribute "ShortNickName" "" "HP PSC 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" + PCFileName "hp-psc_500.ppd" + Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" +@@ -10144,7 +10144,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 812c" + Attribute "NickName" "" "HP Deskjet 812c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 812c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;" + PCFileName "hp-deskjet_812c.ppd" + Attribute "Product" "" "(HP Deskjet 812c Printer)" + } +@@ -10152,7 +10152,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 815c" + Attribute "NickName" "" "HP Deskjet 815c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 815c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;" + PCFileName "hp-deskjet_815c.ppd" + Attribute "Product" "" "(HP Deskjet 815c Printer)" + } +@@ -10184,7 +10184,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 840c" + Attribute "NickName" "" "HP Deskjet 840c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 840c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;" + PCFileName "hp-deskjet_840c.ppd" + Attribute "Product" "" "(HP Deskjet 840c Printer)" + } +@@ -10192,7 +10192,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 841c" + Attribute "NickName" "" "HP Deskjet 841c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 841c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;" + PCFileName "hp-deskjet_841c.ppd" + Attribute "Product" "" "(HP Deskjet 841c Printer)" + } +@@ -10208,7 +10208,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 843c" + Attribute "NickName" "" "HP Deskjet 843c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 843c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;" + PCFileName "hp-deskjet_843c.ppd" + Attribute "Product" "" "(HP Deskjet 843c Printer)" + Attribute "Product" "" "(HP Deskjet 843cxe Printer)" +@@ -10217,7 +10217,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 880c" + Attribute "NickName" "" "HP Deskjet 880c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 880c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;" + PCFileName "hp-deskjet_880c.ppd" + Attribute "Product" "" "(HP Deskjet 880c Printer)" + } +@@ -10233,7 +10233,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 895c" + Attribute "NickName" "" "HP Deskjet 895c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 895c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;" + PCFileName "hp-deskjet_895c.ppd" + Attribute "Product" "" "(HP Deskjet 895cse Printer)" + Attribute "Product" "" "(HP Deskjet 895c Printer)" +@@ -10350,7 +10350,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 825c" + Attribute "NickName" "" "HP Deskjet 825c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 825c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;" + PCFileName "hp-deskjet_825c.ppd" + Attribute "Product" "" "(HP Deskjet 825cvr Printer)" + Attribute "Product" "" "(HP Deskjet 825c Printer)" +@@ -10359,7 +10359,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 845c" + Attribute "NickName" "" "HP Deskjet 845c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 845c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;" + PCFileName "hp-deskjet_845c.ppd" + Attribute "Product" "" "(HP Deskjet 845c Printer)" + Attribute "Product" "" "(HP Deskjet 845cvr Printer)" +@@ -10470,7 +10470,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 850c" + Attribute "NickName" "" "HP Deskjet 850c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 850c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" + PCFileName "hp-deskjet_850c.ppd" + Attribute "Product" "" "(HP Deskjet 850k Printer)" + Attribute "Product" "" "(HP Deskjet 850c Printer)" +@@ -10489,7 +10489,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 870c" + Attribute "NickName" "" "HP Deskjet 870c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 870c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" + PCFileName "hp-deskjet_870c.ppd" + Attribute "Product" "" "(HP Deskjet 870k Printer)" + Attribute "Product" "" "(HP Deskjet 870c Printer)" +@@ -10500,7 +10500,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1150c" + Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1150c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" + PCFileName "hp-officejet_pro_1150c.ppd" + Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" +@@ -10614,7 +10614,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 890c" + Attribute "NickName" "" "HP Deskjet 890c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 890c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" + PCFileName "hp-deskjet_890c.ppd" + Attribute "Product" "" "(HP Deskjet 890cse Printer)" + Attribute "Product" "" "(HP Deskjet 890c Printer)" +@@ -10623,7 +10623,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1170c Series" + Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" + PCFileName "hp-officejet_pro_1170c_series.ppd" + Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" +@@ -11116,7 +11116,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3500" + Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 3500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3500;DES:hp color laserjet 3500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3500;DES:Hewlett-Packard color LaserJet 3500;" + PCFileName "hp-color_laserjet_3500.ppd" + Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" +@@ -11126,7 +11126,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3550" + Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 3550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3550;DES:hp color laserjet 3550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3550;DES:Hewlett-Packard color LaserJet 3550;" + PCFileName "hp-color_laserjet_3550.ppd" + Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" + } diff --git a/hplip-device-reconnected.patch b/hplip-device-reconnected.patch index ccb7fa9..40c5bf8 100644 --- a/hplip-device-reconnected.patch +++ b/hplip-device-reconnected.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.device-reconnected 2009-09-29 16:02:14.717467334 +0100 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-09-29 16:02:20.019342096 +0100 -@@ -638,6 +638,7 @@ int main(int argc, char *argv[]) +diff -up hplip-3.9.10/prnt/backend/hp.c.device-reconnected hplip-3.9.10/prnt/backend/hp.c +--- hplip-3.9.10/prnt/backend/hp.c.device-reconnected 2009-11-03 21:45:10.000000000 +0000 ++++ hplip-3.9.10/prnt/backend/hp.c 2009-11-04 16:25:30.719129509 +0000 +@@ -645,6 +645,7 @@ int main(int argc, char *argv[]) HPMUD_DEVICE hd=-1; HPMUD_CHANNEL cd=-1; int n, total=0, retry=0, size, pages; @@ -9,22 +9,23 @@ diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backe enum HPMUD_RESULT stat; char *printer = getenv("PRINTER"); -@@ -789,10 +790,23 @@ int main(int argc, char *argv[]) - /* IO error, get printer status. */ - if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3])) +@@ -809,11 +810,24 @@ int main(int argc, char *argv[]) + { + exit_stat = BACKEND_STOP; /* stop queue */ goto bugout; ++ } + -+ if (++consecutive_failures == 5) -+ { -+ /* hpmud_write_channel has failed several times in -+ * succession but the Device ID-based status says -+ * the printer is happy. Time to face the fact that -+ * the device has probably reconnected, and our USB -+ * channel is invalidated. */ ++ if (++consecutive_failures == 5) ++ { ++ /* hpmud_write_channel has failed several times in ++ * succession but the Device ID-based status says ++ * the printer is happy. Time to face the fact that ++ * the device has probably reconnected, and our USB ++ * channel is invalidated. */ + -+ BUG("ERROR: device reconnected?"); -+ goto bugout; -+ } ++ BUG("ERROR: device reconnected?"); ++ goto bugout; + } } else { diff --git a/hplip-hpcups-plugin.patch b/hplip-hpcups-plugin.patch deleted file mode 100644 index e466f31..0000000 --- a/hplip-hpcups-plugin.patch +++ /dev/null @@ -1,318 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin 2009-11-02 13:47:00.325103235 +0000 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-02 14:48:00.070102977 +0000 -@@ -6659,7 +6659,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet m1522nf MFP" -- Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" -+ Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" - PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" -@@ -6723,7 +6723,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p2035n" -- Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version" -+ Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2035n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" - PCFileName "hp-laserjet_p2035n-pcl3.ppd" -@@ -6731,7 +6731,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p2035" -- Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version" -+ Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2035" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" - PCFileName "hp-laserjet_p2035-pcl3.ppd" -@@ -6864,7 +6864,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet m2727 MFP" -- Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version" -+ Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m2727 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m2727 mfp;DES:hp laserjet m2727 mfp;" - PCFileName "hp-laserjet_m2727_mfp-pcl3.ppd" -@@ -7734,7 +7734,7 @@ Manufacturer "HP" - // <%LJColor:Normal%> - { - ModelName "HP Color LaserJet cm1312 MFP" -- Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" - PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" -@@ -7742,7 +7742,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet cm1312nfi MFP" -- Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" - PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" -@@ -7816,7 +7816,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet cm2320 MFP" -- Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" - PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" -@@ -7824,7 +7824,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet cm2320fxi MFP" -- Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" - PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" -@@ -7832,7 +7832,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet cm2320n MFP" -- Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" - PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" -@@ -7840,7 +7840,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet cm2320nf MFP" -- Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" - PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" -@@ -10287,7 +10287,7 @@ Manufacturer "HP" - // <%LJZjsMono:Normal%> - { - ModelName "HP LaserJet 1000" -- Attribute "NickName" "" "HP LaserJet 1000, $Version" -+ Attribute "NickName" "" "HP LaserJet 1000, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1000" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1000;DES:hp laserjet 1000;" - PCFileName "hp-laserjet_1000.ppd" -@@ -10295,7 +10295,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet 1005 Series" -- Attribute "NickName" "" "HP LaserJet 1005 Series, $Version" -+ Attribute "NickName" "" "HP LaserJet 1005 Series, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1005 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" - PCFileName "hp-laserjet_1005_series.ppd" -@@ -10303,7 +10303,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet 1018" -- Attribute "NickName" "" "HP LaserJet 1018, $Version" -+ Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1018" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" - PCFileName "hp-laserjet_1018.ppd" -@@ -10312,7 +10312,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet 1020" -- Attribute "NickName" "" "HP LaserJet 1020, $Version" -+ Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1020" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" - PCFileName "hp-laserjet_1020.ppd" -@@ -10321,7 +10321,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet 1022nw" -- Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version" -+ Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1022nw" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022nw;DES:hp laserjet 1022nw;" - PCFileName "hp-laserjet_1022nw-zjs.ppd" -@@ -10329,7 +10329,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet 1022n" -- Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version" -+ Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1022n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022n;DES:hp laserjet 1022n;" - PCFileName "hp-laserjet_1022n-zjs.ppd" -@@ -10338,7 +10338,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet 1022" -- Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version" -+ Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1022" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022;DES:hp laserjet 1022;" - PCFileName "hp-laserjet_1022-zjs.ppd" -@@ -10346,7 +10346,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet m1120 MFP" -- Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version" -+ Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" - PCFileName "hp-laserjet_m1120_mfp.ppd" -@@ -10354,7 +10354,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet m1120n MFP" -- Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version" -+ Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1120n MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" - PCFileName "hp-laserjet_m1120n_mfp.ppd" -@@ -10362,7 +10362,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet m1319f MFP" -- Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version" -+ Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" - PCFileName "hp-laserjet_m1319f_mfp.ppd" -@@ -10370,7 +10370,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p2035n" -- Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version" -+ Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2035n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" - PCFileName "hp-laserjet_p2035n-zjs.ppd" -@@ -10378,7 +10378,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p2035" -- Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version" -+ Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2035" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" - PCFileName "hp-laserjet_p2035-zjs.ppd" -@@ -10498,7 +10498,7 @@ Manufacturer "HP" - // <%LJZjsColor:Normal%> - { - ModelName "HP Color LaserJet cp1215" -- Attribute "NickName" "" "HP Color LaserJet cp1215, $Version" -+ Attribute "NickName" "" "HP Color LaserJet cp1215, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cp1215" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" - PCFileName "hp-color_laserjet_cp1215.ppd" -@@ -10506,7 +10506,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet 1600" -- Attribute "NickName" "" "HP Color LaserJet 1600, $Version" -+ Attribute "NickName" "" "HP Color LaserJet 1600, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 1600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" - PCFileName "hp-color_laserjet_1600.ppd" -@@ -10514,7 +10514,7 @@ Manufacturer "HP" - } - { - ModelName "HP Color LaserJet 2600n" -- Attribute "NickName" "" "HP Color LaserJet 2600n, $Version" -+ Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 2600n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" - PCFileName "hp-color_laserjet_2600n.ppd" -@@ -10791,7 +10791,7 @@ Manufacturer "HP" - // <%LJm1005:Normal%> - { - ModelName "HP LaserJet m1005" -- Attribute "NickName" "" "HP LaserJet m1005, $Version" -+ Attribute "NickName" "" "HP LaserJet m1005, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1005;DES:hp laserjet m1005;" - PCFileName "hp-laserjet_m1005.ppd" -@@ -10799,7 +10799,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p1505n" -- Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version" -+ Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1505n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505n;DES:hp laserjet p1505n;" - PCFileName "hp-laserjet_p1505n-zxs.ppd" -@@ -10807,7 +10807,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p1505" -- Attribute "NickName" "" "HP LaserJet p1505, $Version" -+ Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1505" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" - PCFileName "hp-laserjet_p1505.ppd" -@@ -10815,7 +10815,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p2014" -- Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version" -+ Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2014" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014;DES:hp laserjet p2014;" - PCFileName "hp-laserjet_p2014-zxs.ppd" -@@ -10823,7 +10823,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p2014n" -- Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version" -+ Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2014n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014n;DES:hp laserjet p2014n;" - PCFileName "hp-laserjet_p2014n-zxs.ppd" -@@ -10941,7 +10941,7 @@ Manufacturer "HP" - // <%LJP1XXX:Normal%> - { - ModelName "HP LaserJet p1005" -- Attribute "NickName" "" "HP LaserJet p1005, $Version" -+ Attribute "NickName" "" "HP LaserJet p1005, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" - PCFileName "hp-laserjet_p1005.ppd" -@@ -10949,7 +10949,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p1006" -- Attribute "NickName" "" "HP LaserJet p1006, $Version" -+ Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1006" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" - PCFileName "hp-laserjet_p1006.ppd" -@@ -10957,7 +10957,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p1007" -- Attribute "NickName" "" "HP LaserJet p1007, $Version" -+ Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1007" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" - PCFileName "hp-laserjet_p1007.ppd" -@@ -10965,7 +10965,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p1008" -- Attribute "NickName" "" "HP LaserJet p1008, $Version" -+ Attribute "NickName" "" "HP LaserJet p1008, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1008" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1008;DES:hp laserjet p1008;" - PCFileName "hp-laserjet_p1008.ppd" -@@ -10973,7 +10973,7 @@ Manufacturer "HP" - } - { - ModelName "HP LaserJet p1009" -- Attribute "NickName" "" "HP LaserJet p1009, $Version" -+ Attribute "NickName" "" "HP LaserJet p1009, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1009" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1009;DES:hp laserjet p1009;" - PCFileName "hp-laserjet_p1009.ppd" diff --git a/hplip-hpcups-reorder.patch b/hplip-hpcups-reorder.patch deleted file mode 100644 index 6738051..0000000 --- a/hplip-hpcups-reorder.patch +++ /dev/null @@ -1,1674 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder 2009-08-04 22:42:07.000000000 +0100 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-12 23:17:41.192332302 +0100 -@@ -210,10 +210,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -226,10 +232,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -244,16 +256,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -265,35 +289,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" - { - // Custom page sizes from 1x4in to Legal - HWMargins 18 36 18 36 -@@ -754,8 +749,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -763,12 +762,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -893,10 +886,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -909,10 +908,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -927,16 +932,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -948,35 +965,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" - { - - // Custom page sizes from 1x4in to Legal -@@ -1010,8 +998,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -1019,12 +1011,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -1142,10 +1128,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -1158,10 +1150,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -1176,16 +1174,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -1197,41 +1207,15 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -1239,12 +1223,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -1366,10 +1344,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -1382,10 +1366,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -1400,16 +1390,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -1421,36 +1423,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - { - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 -@@ -1659,8 +1631,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -1668,12 +1644,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -1784,10 +1754,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -1800,10 +1776,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -1818,16 +1800,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -1839,36 +1833,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -2017,10 +1981,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -2033,10 +2003,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -2051,56 +2027,38 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" // custom -- CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard - CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -+ CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" // custom -+ CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" -+ "<>setpagedevice" - - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" -@@ -2259,12 +2217,26 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -2273,12 +2245,24 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -2293,16 +2277,34 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -2314,62 +2316,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -3702,8 +3648,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<>setpagedevice" -@@ -3711,12 +3661,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -3902,12 +3846,26 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -3916,12 +3874,24 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -3936,16 +3906,34 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -3957,62 +3945,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -4039,8 +3971,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<>setpagedevice" -@@ -4048,12 +3984,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -4178,12 +4108,26 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -4192,12 +4136,24 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -4212,16 +4168,34 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -4233,62 +4207,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -4419,10 +4337,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -4435,10 +4359,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -4453,16 +4383,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -4474,36 +4416,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -4655,8 +4567,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<>setpagedevice" -@@ -4664,12 +4580,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5176,10 +5086,14 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -5229,12 +5143,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 (three sided) -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5576,12 +5484,20 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -5590,12 +5506,18 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -5610,14 +5532,20 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -5631,32 +5559,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5790,10 +5692,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -5801,14 +5709,6 @@ Manufacturer "HP" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to A6 - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5919,10 +5819,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -5930,14 +5836,6 @@ Manufacturer "HP" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to A6 - HWMargins 9 9 9 9 - VariablePaperSize Yes -@@ -6125,12 +6023,20 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -6139,12 +6045,18 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -6156,24 +6068,6 @@ Manufacturer "HP" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to 5x7 - HWMargins 9 9 9 9 - VariablePaperSize Yes -@@ -6295,12 +6189,20 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -6309,12 +6211,18 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -6326,24 +6234,6 @@ Manufacturer "HP" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to 5x7 - HWMargins 9 9 9 9 - VariablePaperSize Yes -@@ -7753,7 +7643,7 @@ Manufacturer "HP" - // cupsRowCount values map to PEN_TYPE + 1 from global_types.h - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - Choice "Gray/Grayscale" "<>setpagedevice" -- *Choice "RGB/Color" "<>setpagedevice" -+ *Choice "RGB/Color" "<>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 -@@ -10288,7 +10178,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-steup:" "" -+ Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" - - Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" diff --git a/hplip-mucks-with-spooldir.patch b/hplip-mucks-with-spooldir.patch new file mode 100644 index 0000000..d110ce7 --- /dev/null +++ b/hplip-mucks-with-spooldir.patch @@ -0,0 +1,30 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir 2010-02-26 12:07:47.170265651 +0000 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-02-26 12:09:13.647265807 +0000 +@@ -443,26 +443,6 @@ int HPCupsFilter::StartPrintJob(int arg + + getLogLevel(); + m_JA.job_id = atoi(argv[1]); +- FILE *fp; +- char dFileName[32]; +- memset(dFileName, 0, sizeof(dFileName)); +- m_JA.job_id = atoi(argv[1]); +- snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); +- if ((fp = fopen (dFileName, "r"))) +- { +- char line[258]; +- for (int i = 0; i < 10; i++) +- { +- fgets (line, 256, fp); +- if (!strncmp (line, "%%Pages:", 8)) +- { +- sscanf (line+9, "%d", &m_JA.total_pages); +- break; +- } +- } +- fclose (fp); +- } +- + m_ppd = ppdOpenFile(getenv("PPD")); + if (m_ppd == NULL) { + dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD")); diff --git a/hplip-parenths.patch b/hplip-parenths.patch deleted file mode 100644 index 172bbe0..0000000 --- a/hplip-parenths.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths 2009-08-24 17:20:34.608890337 +0100 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-24 17:22:04.606015304 +0100 -@@ -214,7 +214,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -260,7 +260,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -890,7 +890,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -936,7 +936,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1132,7 +1132,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1178,7 +1178,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1348,7 +1348,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1394,7 +1394,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1758,7 +1758,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1804,7 +1804,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1985,7 +1985,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -2031,7 +2031,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -2225,7 +2225,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -2285,7 +2285,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -3852,7 +3852,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -3912,7 +3912,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -4114,7 +4114,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -4174,7 +4174,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -4341,7 +4341,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -4387,7 +4387,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" diff --git a/hplip-plugin-error.patch b/hplip-plugin-error.patch deleted file mode 100644 index ec4c541..0000000 --- a/hplip-plugin-error.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c~ 2009-10-28 17:03:27.435140391 +0000 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-28 17:12:15.709140073 +0000 -@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP - if (first_time) - { - first_time = 0; -- old_state = ("media-empty-error,media-jam-error," -+ old_state = ("media-empty-error,media-jam-error,hplip.plugin-error," - "cover-open-error,toner-empty-error,other"); - } - -diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp ---- hplip-3.9.8/prnt/hpijs/hpcups.cpp~ 2009-10-28 17:03:27.390139541 +0000 -+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-10-28 17:11:18.980140742 +0000 -@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv) - SendDbusMessage (device_uri, printer, - EVENT_PRINT_FAILED_MISSING_PLUGIN, - argv[2], atoi (argv[1]), argv[3]); -+ fputs ("STATE: +hplip.plugin-error\n", stderr); - BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err); - return 1; - } diff --git a/hplip-preferences-crash.patch b/hplip-preferences-crash.patch deleted file mode 100644 index 8800d09..0000000 --- a/hplip-preferences-crash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up hplip-3.9.8/ui4/devmgr5.py.preferences-crash hplip-3.9.8/ui4/devmgr5.py ---- hplip-3.9.8/ui4/devmgr5.py.preferences-crash 2009-08-04 22:37:22.000000000 +0100 -+++ hplip-3.9.8/ui4/devmgr5.py 2010-01-20 12:10:15.728561588 +0000 -@@ -2019,7 +2019,9 @@ class DevMgr5(QMainWindow, Ui_MainWindo - if dlg.exec_() == QDialog.Accepted: - self.user_settings.load() - -- self.cur_device.sendEvent(EVENT_USER_CONFIGURATION_CHANGED, self.cur_printer) -+ if self.cur_device is not None: -+ self.cur_device.sendEvent(EVENT_USER_CONFIGURATION_CHANGED, -+ self.cur_printer) - - - # *********************************************************************************** diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch new file mode 100644 index 0000000..9db74e2 --- /dev/null +++ b/hplip-pstotiff-is-rubbish.patch @@ -0,0 +1,58 @@ +diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff +--- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-26 12:05:42.883265245 +0000 ++++ hplip-3.10.2/fax/filters/pstotiff 2010-02-26 12:06:06.546266294 +0000 +@@ -1,43 +1,11 @@ +-#!/usr/bin/env python +- +-import os +-import os.path +-import time +-import sys +-import tempfile +- +-READ_SIZE = 8192 +- +-total_bytes_read = 0 +-temp_in_file = "-" +- +-if (len(sys.argv) > 6): +- temp_in_file = sys.argv[6] +- +-temp_out_handle, temp_out_fname = tempfile.mkstemp() +- +-font = "-I/usr/share/cups/fonts" +-device = "-sDEVICE=tiffg4 -dDEBUG -dNOPAUSE -dBATCH -dSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +- +-gs_command = "/usr/bin/gs" + " " + font + " " + device +- +-exit_code = os.system(gs_command) +-#if exit_code != 0: +-# print("Ghostscript returned error (error code %d)!" % exit_code) +-# sys.exit(exit_code) +- +-file_len = os.stat(temp_out_fname).st_size +-if (file_len < READ_SIZE): +- READ_SIZE = file_len +- +-os.close(temp_out_handle) +- +-out_handle = open(temp_out_fname, mode='rb') +-while (total_bytes_read < file_len): +- data = out_handle.read(READ_SIZE) +- sys.stdout.write(data) +- total_bytes_read += READ_SIZE +-out_handle.close() +- +-os.remove(temp_out_fname) +-sys.exit(0) ++#!/bin/sh ++if [ $# -lt 6 ]; then ++ IN=-_ ++else ++ IN="$6" ++fi ++ ++gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \ ++ -dSAFER -dPARANOIDSAFER \ ++ -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ ++ -sstdout=%stderr -sOutputFile=- "$IN" diff --git a/hplip-requirespageregion.patch b/hplip-requirespageregion.patch deleted file mode 100644 index be4da63..0000000 --- a/hplip-requirespageregion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion 2009-08-28 08:59:11.086208461 +0100 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-28 09:35:30.095904252 +0100 -@@ -111,6 +111,8 @@ Throughput 1 - Filter "application/vnd.cups-raster 0 hpcups" - //Filter "application/vnd.cups-command 0 commandtohpijs" - -+Attribute "RequiresPageRegion" "All" "True" -+ - { - // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"... - Manufacturer "HP" diff --git a/hplip-retry-open.patch b/hplip-retry-open.patch index 6a47f7b..3667108 100644 --- a/hplip-retry-open.patch +++ b/hplip-retry-open.patch @@ -1,30 +1,16 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.retry-open 2010-01-05 15:11:56.045911892 +0000 -+++ hplip-3.9.8/prnt/backend/hp.c 2010-01-05 15:12:04.236911642 +0000 -@@ -724,11 +724,21 @@ int main(int argc, char *argv[]) - /* Open hp device. */ - while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK) - { +diff -up hplip-3.9.12/prnt/backend/hp.c.retry-open hplip-3.9.12/prnt/backend/hp.c +--- hplip-3.9.12/prnt/backend/hp.c.retry-open 2010-01-05 15:14:30.000000000 +0000 ++++ hplip-3.9.12/prnt/backend/hp.c 2010-01-05 15:16:03.521911780 +0000 +@@ -741,12 +741,6 @@ int main(int argc, char *argv[]) + goto bugout; + } + - if (stat != HPMUD_R_DEVICE_BUSY) - { -- BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]); +- BUG("ERROR: open device failed stat=%d: %s\n", stat, argv[0]); - goto bugout; - } -+ if (getenv ("CLASS") != NULL) -+ { -+ /* If the CLASS environment variable is set we -+ * need to give other class members a chance in -+ * case their devices are ready to go. -+ */ -+ -+ BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]); -+ BUG("INFO: queuing on next printer in class...\n"); -+ -+ /* Prevent job requeuing too quickly. */ -+ sleep (5); -+ -+ goto bugout; -+ } - +- /* Display user error. */ device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]); + diff --git a/hplip-state-reasons-newline.patch b/hplip-state-reasons-newline.patch deleted file mode 100644 index ed7163f..0000000 --- a/hplip-state-reasons-newline.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.state-reasons-newline hplip-3.9.8/prnt/backend/hp.c -diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline hplip-3.9.8/prnt/hpijs/hpcups.cpp ---- hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline 2009-08-24 10:40:32.407070376 +0100 -+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-08-24 11:04:14.374016107 +0100 -@@ -315,7 +315,7 @@ int HPCups::initContext (char **argv) - m_pSys->pPC->constructor_error != PLUGIN_LIBRARY_MISSING && - m_pSys->DisplayStatus != DISPLAY_PRINTING_CANCELED) - { -- BUG("PrintContext creation failed, error = %d", m_pSys->pPC->constructor_error); -+ BUG("PrintContext creation failed, error = %d\n", m_pSys->pPC->constructor_error); - return 1; - } - -@@ -347,11 +347,11 @@ int HPCups::initContext (char **argv) - case WARN_LOW_INK_YELLOW: - case WARN_LOW_INK_MULTIPLE_PENS: - { -- BUG ("STATE: +marker-supply-low-warning\n"); -+ fputs ("STATE: +marker-supply-low-warning\n", stderr); - break; - } - default: -- BUG ("STATE: -marker-supply-low-warning\n"); -+ fputs ("STATE: -marker-supply-low-warning\n", stderr); - } - } - -@@ -678,7 +678,7 @@ void CancelPrintJob (int sig) - int main (int argc, char **argv) - { - int iRet = hpCups.ProcessJob (argc, argv); -- BUG("hpcups: returning status %d from main", iRet); -+ BUG("hpcups: returning status %d from main\n", iRet); - return iRet; - } - diff --git a/hplip.spec b/hplip.spec index ddebf43..cbb7d97 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.9.8 -Release: 29%{?dist} +Version: 3.10.2 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,22 +13,17 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz -Patch1: hplip-hpcups-reorder.patch +Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch -Patch5: hplip-clear-previous-state-reasons.patch -Patch6: hplip-state-reasons-newline.patch -Patch7: hplip-parenths.patch +Patch5: hplip-device-ids.patch +Patch6: hplip-mucks-with-spooldir.patch Patch8: hplip-retry-open.patch -Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch -Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch -Patch15: hplip-hpcups-plugin.patch Patch16: hplip-bad-low-ink-warning.patch -Patch17: hplip-preferences-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -52,6 +47,9 @@ BuildRequires: openssl-devel BuildRequires: sane-backends-devel BuildRequires: dbus-devel +# Make sure we get postscriptdriver tags. +BuildRequires: pycups, cups + %description The Hewlett-Packard Linux Imaging and Printing Project provides drivers for HP printers and multi-function peripherals. @@ -117,8 +115,8 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q -# Upstream patch to fix paper size order and LJColor device class color space. -%patch1 -p1 -b .hpcups-reorder +# The pstotiff filter is rubbish so replace it (launchpad #528394). +%patch1 -p1 -b .pstotiff-is-rubbish # Fix compilation. %patch2 -p1 -b .strstr-const @@ -129,44 +127,28 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Make sure to avoid handwritten asm. %patch4 -p1 -b .no-asm -# Clear previous state reasons in the hp backend (bug #501338). -%patch5 -p1 -b .clear-previous-state-reasons +# Corrected several IEEE 1284 Device IDs using foomatic data. +%patch5 -p1 -b .device-ids -# Don't hide state reason changes by missing out newlines in stderr. -%patch6 -p1 -b .state-reasons-newline - -# Fixed typos in page sizes (bug #515469). -%patch7 -p1 -b .parenths +# Stopped hpcups pointlessly trying to read spool files +# directly (bug #552572). +%patch6 -p1 -b .mucks-with-spooldir # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open -# Set RequiresPageRegion in hpcups PPDs (bug #518756). -%patch9 -p1 -b .requirespageregion - # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected -# Set a printer-state-reason when there's a missing required plugin -# (bug #531330). -%patch13 -p1 -b .plugin-error - # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe -# Added 'requires proprietary plugin' to appropriate model names -# (bug #513283). -%patch15 -p1 -b .hpcups-plugin - # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning -# Fixed crash when using Preferences dialog (bug #555979). -%patch17 -p1 -b .preferences-crash - sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -231,6 +213,7 @@ rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc rm -f %{buildroot}%{_datadir}/hplip/hplip-install rm -rf %{buildroot}%{_datadir}/hplip/install.* rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template +rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types # The systray applet doesn't work properly (displays icon as a # window), so don't ship the launcher yet. @@ -271,6 +254,8 @@ rm -rf %{buildroot} # CUPS serverbin directory. /usr/lib/cups/backend/hp /usr/lib/cups/backend/hpfax +/usr/lib/cups/filter/pstotiff +%{_datadir}/cups/mime/pstotiff.convs # Files %{_datadir}/hplip/align.py* %{_datadir}/hplip/clean.py* @@ -301,8 +286,7 @@ rm -rf %{buildroot} %{_datadir}/hplip/unload.py* %{_datadir}/hplip/wificonfig.py* # Directories -%dir %{_datadir}/hplip/base -%attr(0644,root,root) %{_datadir}/hplip/base/* +%{_datadir}/hplip/base %{_datadir}/hplip/copier %{_datadir}/hplip/data/ldl %{_datadir}/hplip/data/localization @@ -378,35 +362,58 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog -* Tue Feb 16 2010 Tim Waugh - 3.9.8-29 +* Fri Feb 26 2010 Tim Waugh - 3.10.2-1 +- 3.10.2. No longer need preferences-crash patch. +- The pstotiff filter is rubbish so replace it (launchpad #528394). +- Stopped hpcups pointlessly trying to read spool files + directly (bug #552572). + +* Sat Feb 20 2010 Tim Waugh - 3.9.12-8 +- Corrected several IEEE 1284 Device IDs using foomatic data + (launchpad bug #523259). + +* Tue Feb 16 2010 Tim Waugh - 3.9.12-7 - Ship %%{_datadir}/hplip/prnt/plugins directory (bug #564551). -* Wed Jan 20 2010 Tim Waugh - 3.9.8-28 +* Fri Feb 5 2010 Tim Waugh - 3.9.12-6 +- Build requires cups for postscriptdriver tags for .drv file. + +* Thu Feb 4 2010 Tim Waugh - 3.9.12-5 +- Rebuild for postscriptdriver tags. + +* Wed Jan 20 2010 Tim Waugh - 3.9.12-4 - Fixed crash when using Preferences dialog (bug #555979). -* Tue Jan 12 2010 Tim Waugh - 3.9.8-27 +* Tue Jan 12 2010 Tim Waugh - 3.9.12-3 - Do ship pkit module even though the PolicyKit mechanism is not shipped (bug #554817). -* Tue Jan 5 2010 Tim Waugh - 3.9.8-26 +* Tue Jan 5 2010 Tim Waugh - 3.9.12-2 - Retry when connecting to device fails (bug #532112). - Don't ship PolicyKit mechanism (bug #551773). -- Don't run automake/autoconf etc as it causes build failures. -* Thu Dec 10 2009 Tim Waugh 3.9.8-25 +* Tue Dec 22 2009 Tim Waugh - 3.9.12-1 +- 3.9.12. No longer need hpcups-plugin patch. + +* Thu Dec 10 2009 Tim Waugh - 3.9.10-5 - Reverted fix for bug #533462 until bug #541604 is solved. -* Thu Nov 26 2009 Tim Waugh 3.9.8-24 +* Thu Nov 26 2009 Tim Waugh 3.9.10-4 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). -* Thu Nov 26 2009 Tim Waugh 3.9.8-23 +* Thu Nov 26 2009 Tim Waugh 3.9.10-3 - Removed duplex constraints on page sizes with imageable areas larger than possible when duplexing (bug #541572). - Fixed duplex reverse sides being horizontally flipped (bug #541604). -* Wed Nov 18 2009 Tim Waugh 3.9.8-22 +* Wed Nov 18 2009 Tim Waugh 3.9.10-2 - Fixed duplex handling in hpcups.drv (bug #533462). +* Wed Nov 4 2009 Tim Waugh 3.9.10-1 +- 3.9.10. No longer need clear-previous-state-reasons, + hpcups-reorder, non-scripts, parenths, plugin-error, + requirespageregion or state-reasons-newline patches. + * Mon Nov 2 2009 Tim Waugh 3.9.8-21 - Added 'requires proprietary plugin' to appropriate model names (bug #513283). diff --git a/sources b/sources index e478641..c39277f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb1cf49c5f062993b78fc2768f531ed8 hplip-3.9.8.tar.gz +4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz From 07f0a4bf65356f49016033de12ca4f2cd219fc97 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 1 Mar 2010 10:07:52 +0000 Subject: [PATCH 25/69] - Use a temporary file in pstotiff to allow gs random access. --- hplip-pstotiff-is-rubbish.patch | 13 +++++++++---- hplip.spec | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index 9db74e2..5091e19 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,7 +1,7 @@ diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff ---- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-26 12:05:42.883265245 +0000 -+++ hplip-3.10.2/fax/filters/pstotiff 2010-02-26 12:06:06.546266294 +0000 -@@ -1,43 +1,11 @@ +--- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-24 23:07:09.000000000 +0000 ++++ hplip-3.10.2/fax/filters/pstotiff 2010-03-01 09:52:50.676611385 +0000 +@@ -1,43 +1,16 @@ -#!/usr/bin/env python - -import os @@ -52,7 +52,12 @@ diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/ + IN="$6" +fi + ++TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1 +gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \ + -dSAFER -dPARANOIDSAFER \ + -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ -+ -sstdout=%stderr -sOutputFile=- "$IN" ++ -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN" ++RET=$? ++cat "$TMPFILE" ++rm -f "$TMPFILE" ++exit $RET diff --git a/hplip.spec b/hplip.spec index cbb7d97..70e7530 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -362,6 +362,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Mon Mar 1 2010 Tim Waugh - 3.10.2-2 +- Use a temporary file in pstotiff to allow gs random access. + * Fri Feb 26 2010 Tim Waugh - 3.10.2-1 - 3.10.2. No longer need preferences-crash patch. - The pstotiff filter is rubbish so replace it (launchpad #528394). From 717e31bbfff56441fb54116fe89bb317646d32d8 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 1 Mar 2010 11:36:16 +0000 Subject: [PATCH 26/69] - Removed SYSFS use in udev rules and actually made them work (bug #560754). --- hplip-udev-rules.patch | 17 +++++++++++++++++ hplip.spec | 7 +++++++ 2 files changed, 24 insertions(+) create mode 100644 hplip-udev-rules.patch diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch new file mode 100644 index 0000000..49cb808 --- /dev/null +++ b/hplip-udev-rules.patch @@ -0,0 +1,17 @@ +diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules +--- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000 ++++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000 +@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + LABEL="pid_test" + + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + +-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" ++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + +-LABEL="hpmud_rules_end" +\ No newline at end of file ++LABEL="hpmud_rules_end" diff --git a/hplip.spec b/hplip.spec index 70e7530..382d1b4 100644 --- a/hplip.spec +++ b/hplip.spec @@ -19,6 +19,7 @@ Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch +Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -134,6 +135,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # directly (bug #552572). %patch6 -p1 -b .mucks-with-spooldir +# Removed SYSFS use in udev rules and actually made them work +# (bug #560754). +%patch7 -p1 -b .udev-rules + # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -363,6 +368,8 @@ fi %changelog * Mon Mar 1 2010 Tim Waugh - 3.10.2-2 +- Removed SYSFS use in udev rules and actually made them work + (bug #560754). - Use a temporary file in pstotiff to allow gs random access. * Fri Feb 26 2010 Tim Waugh - 3.10.2-1 From 14f23263b381fddf13fc2086a3bd26b80ce3eef3 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 3 Mar 2010 10:45:12 +0000 Subject: [PATCH 27/69] - Set defattr in gui sub-package file manifest. - Avoid mixed use of spaces and tabs. --- hplip.spec | 61 +++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/hplip.spec b/hplip.spec index 382d1b4..e633872 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -25,7 +25,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service Requires(post): /sbin/chkconfig @@ -160,11 +160,11 @@ sed -i.duplex-constraints \ %build %configure \ - --enable-scan-build --enable-gui-build --enable-fax-build \ - --disable-foomatic-rip-hplip-install --enable-pp-build \ - --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \ - --enable-hpijs-install --enable-udev-acl-rules \ - --disable-policykit + --enable-scan-build --enable-gui-build --enable-fax-build \ + --disable-foomatic-rip-hplip-install --enable-pp-build \ + --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \ + --enable-hpijs-install --enable-udev-acl-rules \ + --disable-policykit sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -177,31 +177,31 @@ mkdir -p %{buildroot}%{_bindir} make install DESTDIR=%{buildroot} # Remove unpackaged files -rm -rf %{buildroot}%{_sysconfdir}/sane.d \ - %{buildroot}%{_docdir} \ - %{buildroot}%{_datadir}/hal/fdi \ - %{buildroot}%{_datadir}/hplip/pkservice.py \ - %{buildroot}%{_bindir}/hp-pkservice +rm -rf %{buildroot}%{_sysconfdir}/sane.d \ + %{buildroot}%{_docdir} \ + %{buildroot}%{_datadir}/hal/fdi \ + %{buildroot}%{_datadir}/hplip/pkservice.py \ + %{buildroot}%{_bindir}/hp-pkservice -rm -f %{buildroot}%{_bindir}/foomatic-rip \ - %{buildroot}%{_libdir}/cups/filter/foomatic-rip \ - %{buildroot}%{_libdir}/*.la \ - %{buildroot}%{_libdir}/python*/site-packages/*.la \ - %{buildroot}%{_libdir}/libhpip.so \ - %{buildroot}%{_libdir}/sane/*.la \ - %{buildroot}%{_datadir}/cups/model/foomatic-ppds \ - %{buildroot}%{_datadir}/applications/hplip.desktop \ - %{buildroot}%{_datadir}/ppd/HP/*.ppd +rm -f %{buildroot}%{_bindir}/foomatic-rip \ + %{buildroot}%{_libdir}/cups/filter/foomatic-rip \ + %{buildroot}%{_libdir}/*.la \ + %{buildroot}%{_libdir}/python*/site-packages/*.la \ + %{buildroot}%{_libdir}/libhpip.so \ + %{buildroot}%{_libdir}/sane/*.la \ + %{buildroot}%{_datadir}/cups/model/foomatic-ppds \ + %{buildroot}%{_datadir}/applications/hplip.desktop \ + %{buildroot}%{_datadir}/ppd/HP/*.ppd mkdir -p %{buildroot}%{_datadir}/applications sed -i -e '/^Categories=/d' hplip.desktop -desktop-file-install --vendor HP \ - --dir %{buildroot}%{_datadir}/applications \ - --add-category System \ - --add-category Settings \ - --add-category HardwareSettings \ - --add-category Application \ - hplip.desktop +desktop-file-install --vendor HP \ + --dir %{buildroot}%{_datadir}/applications \ + --add-category System \ + --add-category Settings \ + --add-category HardwareSettings \ + --add-category Application \ + hplip.desktop %{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio @@ -321,6 +321,7 @@ rm -rf %{buildroot} %{_libdir}/python*/site-packages/* %files gui +%defattr(-,root,root,-) %{_bindir}/hp-check %{_bindir}/hp-print %{_bindir}/hp-systray @@ -367,6 +368,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Wed Mar 3 2010 Tim Waugh - 3.10.2-3 +- Set defattr in gui sub-package file manifest. +- Avoid mixed use of spaces and tabs. + * Mon Mar 1 2010 Tim Waugh - 3.10.2-2 - Removed SYSFS use in udev rules and actually made them work (bug #560754). From 7e2f1514764eb9ed90d76130f9c7481ac4ad1573 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 4 Mar 2010 09:30:01 +0000 Subject: [PATCH 28/69] - Main package doesn't require hal. - Sub-package common requires udev. --- hplip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hplip.spec b/hplip.spec index e633872..f878ac4 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -36,7 +36,6 @@ Requires(preun): /sbin/chkconfig Requires: hpijs = %{hpijs_epoch}:%{version}-%{release} Requires: python-imaging -Requires: hal BuildRequires: net-snmp-devel BuildRequires: cups-devel @@ -59,6 +58,7 @@ drivers for HP printers and multi-function peripherals. Summary: Files needed by the HPLIP printer and scanner drivers Group: System Environment/Libraries License: GPLv2+ +Requires: udev %description common Files needed by the HPLIP printer and scanner drivers. @@ -368,6 +368,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Mar 4 2010 Tim Waugh - 3.10.2-4 +- Main package doesn't require hal. +- Sub-package common requires udev. + * Wed Mar 3 2010 Tim Waugh - 3.10.2-3 - Set defattr in gui sub-package file manifest. - Avoid mixed use of spaces and tabs. From fc033645a793cace10a3aeeeba2fbfd59cf0e121 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 23 Mar 2010 16:55:08 +0000 Subject: [PATCH 29/69] - Explicitly destroy tray icon on exit (bug #543286). --- hplip-tray-icon-crash.patch | 11 +++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 hplip-tray-icon-crash.patch diff --git a/hplip-tray-icon-crash.patch b/hplip-tray-icon-crash.patch new file mode 100644 index 0000000..a603cd3 --- /dev/null +++ b/hplip-tray-icon-crash.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.10.2/ui4/systemtray.py.tray-icon-crash hplip-3.10.2/ui4/systemtray.py +--- hplip-3.10.2/ui4/systemtray.py.tray-icon-crash 2010-02-24 23:07:15.000000000 +0000 ++++ hplip-3.10.2/ui4/systemtray.py 2010-03-23 16:42:24.476504861 +0000 +@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication): + log.debug("Exiting") + self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT) + self.quit() ++ del self.tray_icon + + + def toolboxTriggered(self): diff --git a/hplip.spec b/hplip.spec index cbb7d97..8943813 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -19,6 +19,7 @@ Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch +Patch7: hplip-tray-icon-crash.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # directly (bug #552572). %patch6 -p1 -b .mucks-with-spooldir +# Explicitly destroy tray icon on exit (bug #543286). +%patch7 -p1 -b .tray-icon-crash + # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -362,6 +366,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Tue Mar 23 2010 Tim Waugh - 3.10.2-2 +- Explicitly destroy tray icon on exit (bug #543286). + * Fri Feb 26 2010 Tim Waugh - 3.10.2-1 - 3.10.2. No longer need preferences-crash patch. - The pstotiff filter is rubbish so replace it (launchpad #528394). From 667b5d0505dbb27beb52000bdfdcb474c3adf8d0 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 23 Mar 2010 17:16:03 +0000 Subject: [PATCH 30/69] - Explicitly destroy tray icon on exit (bug #543286). --- hplip-tray-icon-crash.patch | 11 +++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 hplip-tray-icon-crash.patch diff --git a/hplip-tray-icon-crash.patch b/hplip-tray-icon-crash.patch new file mode 100644 index 0000000..a603cd3 --- /dev/null +++ b/hplip-tray-icon-crash.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.10.2/ui4/systemtray.py.tray-icon-crash hplip-3.10.2/ui4/systemtray.py +--- hplip-3.10.2/ui4/systemtray.py.tray-icon-crash 2010-02-24 23:07:15.000000000 +0000 ++++ hplip-3.10.2/ui4/systemtray.py 2010-03-23 16:42:24.476504861 +0000 +@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication): + log.debug("Exiting") + self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT) + self.quit() ++ del self.tray_icon + + + def toolboxTriggered(self): diff --git a/hplip.spec b/hplip.spec index f878ac4..f78a231 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -21,6 +21,7 @@ Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch +Patch9: hplip-tray-icon-crash.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch @@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open +# Explicitly destroy tray icon on exit (bug #543286). +%patch9 -p1 -b .tray-icon-crash + # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method @@ -368,6 +372,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Tue Mar 23 2010 Tim Waugh - 3.10.2-5 +- Explicitly destroy tray icon on exit (bug #543286). + * Thu Mar 4 2010 Tim Waugh - 3.10.2-4 - Main package doesn't require hal. - Sub-package common requires udev. From f06d2366544491c8dbb2ee12fbe0c3e2b38f7534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Fri, 26 Mar 2010 15:36:41 +0000 Subject: [PATCH 31/69] - Add Device ID for HP LaserJet 2300 (#576928) --- hplip-device-ids.patch | 9 +++++++++ hplip-laserjet_2300-deviceID.patch | 22 ++++++++++++++++++++++ hplip.spec | 14 +++++++++++++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 hplip-laserjet_2300-deviceID.patch diff --git a/hplip-device-ids.patch b/hplip-device-ids.patch index 9f52a6d..bfe09f7 100644 --- a/hplip-device-ids.patch +++ b/hplip-device-ids.patch @@ -622,6 +622,15 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" +@@ -9241,7 +9241,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2300" + Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300;DES:hp laserjet 2300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" + PCFileName "hp-laserjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2300 Printer)" + Attribute "Product" "" "(HP LaserJet 2300n Printer)" @@ -7275,7 +7275,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" diff --git a/hplip-laserjet_2300-deviceID.patch b/hplip-laserjet_2300-deviceID.patch new file mode 100644 index 0000000..5b46325 --- /dev/null +++ b/hplip-laserjet_2300-deviceID.patch @@ -0,0 +1,22 @@ +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:32.000000000 +0100 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-03-26 16:16:30.000000000 +0100 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:35.000000000 +0100 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-03-26 16:16:38.000000000 +0100 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= diff --git a/hplip.spec b/hplip.spec index f78a231..be46092 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,8 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch +Patch17: hplip-laserjet_2300-deviceID.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -158,6 +160,13 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning +# Add Device ID for HP LaserJet 2300 (#576928) +gunzip prnt/ps/hp-laserjet_2300-ps.ppd.gz +gunzip prnt/ps/hp-laserjet_2300_series-ps.ppd.gz +%patch17 -p1 -b .laserjet_2300-deviceID +gzip -n prnt/ps/hp-laserjet_2300-ps.ppd +gzip -n prnt/ps/hp-laserjet_2300_series-ps.ppd + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -372,6 +381,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Fri Mar 26 2010 Jiri Popelka - 3.10.2-6 +- Add Device ID for HP LaserJet 2300 (#576928) + * Tue Mar 23 2010 Tim Waugh - 3.10.2-5 - Explicitly destroy tray icon on exit (bug #543286). From a27e2944bff9182d7f154c31f4ba6e21080e9303 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 7 Apr 2010 14:22:19 +0000 Subject: [PATCH 32/69] - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). --- .cvsignore | 1 + hplip.spec | 13 ++++++++++++- sources | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 978ed68..0b53a69 100644 --- a/.cvsignore +++ b/.cvsignore @@ -31,3 +31,4 @@ hplip-3.9.2.tar.gz hplip-3.9.6b.tar.gz hplip-3.9.8.tar.gz hplip-3.10.2.tar.gz +hpcups-update-ppds.sh diff --git a/hplip.spec b/hplip.spec index 8943813..e09c695 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,6 +13,7 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz +Source1: hpcups-update-ppds.sh Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch @@ -202,6 +203,9 @@ desktop-file-install --vendor HP \ --add-category Application \ hplip.desktop +# Regenerate hpcups PPDs on upgrade if necessary (bug #579355). +install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds + %{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio @@ -337,6 +341,7 @@ rm -rf %{buildroot} %files -n hpijs %defattr(-,root,root) %{_bindir}/hpijs +%{_bindir}/hpcups-update-ppds %dir %{_datadir}/ppd/HP %{_datadir}/ppd/HP/*.ppd.gz %{_datadir}/cups/drv/* @@ -365,7 +370,13 @@ fi %postun gui /usr/bin/update-desktop-database &>/dev/null ||: +%post -n hpijs +%{_bindir}/hpcups-update-ppds &>/dev/null ||: + %changelog +* Wed Apr 7 2010 Tim Waugh - 3.10.2-3 +- Regenerate hpcups PPDs on upgrade if necessary (bug #579355). + * Tue Mar 23 2010 Tim Waugh - 3.10.2-2 - Explicitly destroy tray icon on exit (bug #543286). diff --git a/sources b/sources index c39277f..73c48b1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz +110820c749dc7ec81e949c193187cb39 hpcups-update-ppds.sh From 247546312dca77034c8dae0cc0f54a8e32f25c55 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 7 Apr 2010 14:33:46 +0000 Subject: [PATCH 33/69] - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). --- .cvsignore | 1 + hplip.spec | 13 ++++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d80519..8a6d5d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -33,3 +33,4 @@ hplip-3.9.8.tar.gz hplip-3.9.10.tar.gz hplip-3.9.12.tar.gz hplip-3.10.2.tar.gz +hpcups-update-ppds.sh diff --git a/hplip.spec b/hplip.spec index be46092..31f3234 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,6 +13,7 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz +Source1: hpcups-update-ppds.sh Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch @@ -216,6 +217,9 @@ desktop-file-install --vendor HP \ --add-category Application \ hplip.desktop +# Regenerate hpcups PPDs on upgrade if necessary (bug #579355). +install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds + %{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio @@ -352,6 +356,7 @@ rm -rf %{buildroot} %files -n hpijs %defattr(-,root,root) %{_bindir}/hpijs +%{_bindir}/hpcups-update-ppds %dir %{_datadir}/ppd/HP %{_datadir}/ppd/HP/*.ppd.gz %{_datadir}/cups/drv/* @@ -380,7 +385,13 @@ fi %postun gui /usr/bin/update-desktop-database &>/dev/null ||: +%post -n hpijs +%{_bindir}/hpcups-update-ppds &>/dev/null ||: + %changelog +* Wed Apr 7 2010 Tim Waugh - 3.10.2-7 +- Regenerate hpcups PPDs on upgrade if necessary (bug #579355). + * Fri Mar 26 2010 Jiri Popelka - 3.10.2-6 - Add Device ID for HP LaserJet 2300 (#576928) diff --git a/sources b/sources index 373fe8a..73c48b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2b0906b4a57b437988829557ca62adfd hplip-3.9.12.tar.gz 4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz +110820c749dc7ec81e949c193187cb39 hpcups-update-ppds.sh From 7bdb9027cba67c7180f1321cb446943f3fdf8af4 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 7 Apr 2010 15:23:05 +0000 Subject: [PATCH 34/69] - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). --- hpcups-update-ppds.sh | 111 ++++++++++++++++++++++++++++++++++++++++++ hplip.spec | 4 +- sources | 1 - 3 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 hpcups-update-ppds.sh diff --git a/hpcups-update-ppds.sh b/hpcups-update-ppds.sh new file mode 100644 index 0000000..15b899d --- /dev/null +++ b/hpcups-update-ppds.sh @@ -0,0 +1,111 @@ +#!/bin/bash + +## Copyright (C) 2010 Red Hat, Inc. +## Authors: +## Tim Waugh + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +## Purpose: Update hpcups PPDs when necessary. + +sock=/var/run/cups/cups.sock +running=$(LC_ALL=C lpstat -h "$sock" -r 2>/dev/null) +if [ "$?" -ne 0 ] +then + # No lpstat in path + exit 0 +fi + +if [ -z "${running##*not*}" ] +then + # scheduler is not running + exit 0 +fi + +trap 'rm -f "$tmpdir"/models; rmdir "$tmpdir"; exit 0' \ + 0 HUP INT QUIT ILL ABRT PIPE TERM + +debug=true +tmpdir="$(mktemp -d)" +for ppd in /etc/cups/ppd/*.ppd +do + [ -r "$ppd" ] || continue + queue="${ppd#/etc/cups/ppd/}" + queue="${queue%.ppd}" + lpstat -h "$sock" -p "$queue" &>/dev/null || continue + + # We have PPD associated with a queue. Find out its NickName + $debug && echo "Examining $queue" + nickname="$(grep '^\*NickName:' "$ppd")" + nickname="${nickname#*\"}" # strip text up to and incl first double quote + nickname="${nickname%\"*}" # strip final double quote + $debug && echo "NickName is: $nickname" + + # Is it an hpcups PPD? + [ -z "${nickname##*, hpcups*}" ] || continue + $debug && echo "hpcups: true" + + # Does it have an hpPrinterLanguage attribute? + grep -q '^\*hpPrinterLanguage:' "$ppd" &>/dev/null && continue + $debug && echo "No hpPrinterLanguage attribute" + + # No: need to regenerate the PPD. + if [ ! -f "$tmpdir/models" ] + then + # Get list of driver URIs and NickNames + lpinfo -h "$sock" --include-schemes=drv -m 2>/dev/null >"$tmpdir/models" + fi + + # Strip hpcups version from NickName + nickname="${nickname%, hpcups*}" + $debug && echo "Stripped NickName: $nickname" + while read line + do + uri=${line%% *} + nn="${line#$uri }" + [ -z "${nn##*, hpcups*}" ] || continue + + nn="${nn%, hpcups*}" + if [ "$nn" == "$nickname" ] + then + $debug && echo "Match found, URI: $uri" + + # Unfortunately CUPS will reset the page size when we + # change the PPD, due to the weird page size names that + # HPLIP uses. Try to maintain the existing page size. + size="$(grep '^\*DefaultPageSize:' "$ppd")" + size="${size##* }" # strip until after first ' ' + size="${size%% *}" # strip after any ' ' + $debug && echo "PageSize is $size" + + if [ -z "${size#*Duplex}" ] + then + # Special handling for duplex sizes because HPLIP + # broke backwards compatibility with *that* too! + size="${size%Duplex}.Duplex" + fi + + null=/dev/null + $debug && null=/dev/stdout + lpadmin -h "$sock" -p "$queue" -m "$uri" &>"$null" || : + $debug && echo "PPD regenerated" + + lpadmin -h "$sock" -p "$queue" -o PageSize="$size" &>"$null" || : + $debug && echo "PageSize restored to $size" + break + fi + done <"$tmpdir/models" +done +exit 0 diff --git a/hplip.spec b/hplip.spec index e09c695..97f1200 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -374,7 +374,7 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog -* Wed Apr 7 2010 Tim Waugh - 3.10.2-3 +* Wed Apr 7 2010 Tim Waugh - 3.10.2-4 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). * Tue Mar 23 2010 Tim Waugh - 3.10.2-2 diff --git a/sources b/sources index 73c48b1..c39277f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz -110820c749dc7ec81e949c193187cb39 hpcups-update-ppds.sh From f2aa54c611a7b59780ec75743cbc6a5fc26b7551 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 7 Apr 2010 15:24:50 +0000 Subject: [PATCH 35/69] - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). --- hpcups-update-ppds.sh | 111 ++++++++++++++++++++++++++++++++++++++++++ hplip.spec | 4 +- sources | 1 - 3 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 hpcups-update-ppds.sh diff --git a/hpcups-update-ppds.sh b/hpcups-update-ppds.sh new file mode 100644 index 0000000..15b899d --- /dev/null +++ b/hpcups-update-ppds.sh @@ -0,0 +1,111 @@ +#!/bin/bash + +## Copyright (C) 2010 Red Hat, Inc. +## Authors: +## Tim Waugh + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +## Purpose: Update hpcups PPDs when necessary. + +sock=/var/run/cups/cups.sock +running=$(LC_ALL=C lpstat -h "$sock" -r 2>/dev/null) +if [ "$?" -ne 0 ] +then + # No lpstat in path + exit 0 +fi + +if [ -z "${running##*not*}" ] +then + # scheduler is not running + exit 0 +fi + +trap 'rm -f "$tmpdir"/models; rmdir "$tmpdir"; exit 0' \ + 0 HUP INT QUIT ILL ABRT PIPE TERM + +debug=true +tmpdir="$(mktemp -d)" +for ppd in /etc/cups/ppd/*.ppd +do + [ -r "$ppd" ] || continue + queue="${ppd#/etc/cups/ppd/}" + queue="${queue%.ppd}" + lpstat -h "$sock" -p "$queue" &>/dev/null || continue + + # We have PPD associated with a queue. Find out its NickName + $debug && echo "Examining $queue" + nickname="$(grep '^\*NickName:' "$ppd")" + nickname="${nickname#*\"}" # strip text up to and incl first double quote + nickname="${nickname%\"*}" # strip final double quote + $debug && echo "NickName is: $nickname" + + # Is it an hpcups PPD? + [ -z "${nickname##*, hpcups*}" ] || continue + $debug && echo "hpcups: true" + + # Does it have an hpPrinterLanguage attribute? + grep -q '^\*hpPrinterLanguage:' "$ppd" &>/dev/null && continue + $debug && echo "No hpPrinterLanguage attribute" + + # No: need to regenerate the PPD. + if [ ! -f "$tmpdir/models" ] + then + # Get list of driver URIs and NickNames + lpinfo -h "$sock" --include-schemes=drv -m 2>/dev/null >"$tmpdir/models" + fi + + # Strip hpcups version from NickName + nickname="${nickname%, hpcups*}" + $debug && echo "Stripped NickName: $nickname" + while read line + do + uri=${line%% *} + nn="${line#$uri }" + [ -z "${nn##*, hpcups*}" ] || continue + + nn="${nn%, hpcups*}" + if [ "$nn" == "$nickname" ] + then + $debug && echo "Match found, URI: $uri" + + # Unfortunately CUPS will reset the page size when we + # change the PPD, due to the weird page size names that + # HPLIP uses. Try to maintain the existing page size. + size="$(grep '^\*DefaultPageSize:' "$ppd")" + size="${size##* }" # strip until after first ' ' + size="${size%% *}" # strip after any ' ' + $debug && echo "PageSize is $size" + + if [ -z "${size#*Duplex}" ] + then + # Special handling for duplex sizes because HPLIP + # broke backwards compatibility with *that* too! + size="${size%Duplex}.Duplex" + fi + + null=/dev/null + $debug && null=/dev/stdout + lpadmin -h "$sock" -p "$queue" -m "$uri" &>"$null" || : + $debug && echo "PPD regenerated" + + lpadmin -h "$sock" -p "$queue" -o PageSize="$size" &>"$null" || : + $debug && echo "PageSize restored to $size" + break + fi + done <"$tmpdir/models" +done +exit 0 diff --git a/hplip.spec b/hplip.spec index 31f3234..3fca01a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -389,7 +389,7 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog -* Wed Apr 7 2010 Tim Waugh - 3.10.2-7 +* Wed Apr 7 2010 Tim Waugh - 3.10.2-8 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). * Fri Mar 26 2010 Jiri Popelka - 3.10.2-6 diff --git a/sources b/sources index 73c48b1..c39277f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz -110820c749dc7ec81e949c193187cb39 hpcups-update-ppds.sh From 9641bc0314d84751d5e3764e20a4eb9f747dd3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Fri, 9 Apr 2010 12:25:42 +0000 Subject: [PATCH 36/69] - Added/Corrected several IEEE 1284 Device IDs (bugs #577262, #577282, #577282, #577288, #577292, #577302, ,#577306, #577308, #577898, #579920, #580231) --- ...ice-ids.patch => hplip-deviceIDs-drv.patch | 368 ++++++++++-------- hplip-deviceIDs-ppd.patch | 143 +++++++ hplip-laserjet_2300-deviceID.patch | 22 -- hplip.spec | 33 +- 4 files changed, 381 insertions(+), 185 deletions(-) rename hplip-device-ids.patch => hplip-deviceIDs-drv.patch (85%) create mode 100644 hplip-deviceIDs-ppd.patch delete mode 100644 hplip-laserjet_2300-deviceID.patch diff --git a/hplip-device-ids.patch b/hplip-deviceIDs-drv.patch similarity index 85% rename from hplip-device-ids.patch rename to hplip-deviceIDs-drv.patch index bfe09f7..c903dcb 100644 --- a/hplip-device-ids.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hpcups.drv.in ---- hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids 2010-02-20 11:18:12.473921525 +0000 -+++ hplip-3.9.12/prnt/drv/hpcups.drv.in 2010-02-20 14:44:58.326282207 +0000 -@@ -401,7 +401,7 @@ Manufacturer "HP" +diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in +--- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-25 00:09:42.000000000 +0100 ++++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-09 11:09:10.000000000 +0200 +@@ -421,7 +421,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -409,7 +409,7 @@ Manufacturer "HP" +@@ -429,7 +429,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -426,7 +426,7 @@ Manufacturer "HP" +@@ -446,7 +446,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -474,7 +474,7 @@ Manufacturer "HP" +@@ -494,7 +494,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -490,7 +490,7 @@ Manufacturer "HP" +@@ -510,7 +510,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -506,7 +506,7 @@ Manufacturer "HP" +@@ -526,7 +526,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -514,7 +514,7 @@ Manufacturer "HP" +@@ -534,7 +534,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -546,7 +546,7 @@ Manufacturer "HP" +@@ -566,7 +566,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -562,7 +562,7 @@ Manufacturer "HP" +@@ -582,7 +582,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -581,7 +581,7 @@ Manufacturer "HP" +@@ -601,7 +601,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -622,7 +622,7 @@ Manufacturer "HP" +@@ -642,7 +642,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -641,7 +641,7 @@ Manufacturer "HP" +@@ -661,7 +661,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -706,7 +706,7 @@ Manufacturer "HP" +@@ -718,7 +718,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 959c" + Attribute "NickName" "" "HP Deskjet 959c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 959c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_959c.ppd" + Attribute "Product" "" "(HP Deskjet 959c Printer)" + } +@@ -726,7 +726,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -118,7 +127,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -726,7 +726,7 @@ Manufacturer "HP" +@@ -746,7 +746,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -127,7 +136,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -735,7 +735,7 @@ Manufacturer "HP" +@@ -755,7 +755,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -136,7 +145,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -769,7 +769,7 @@ Manufacturer "HP" +@@ -789,7 +789,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -145,7 +154,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -807,7 +807,7 @@ Manufacturer "HP" +@@ -827,7 +827,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -154,7 +163,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -815,7 +815,7 @@ Manufacturer "HP" +@@ -835,7 +835,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -163,7 +172,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -866,7 +866,7 @@ Manufacturer "HP" +@@ -886,7 +886,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -172,7 +181,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1062,7 +1062,7 @@ Manufacturer "HP" +@@ -1082,7 +1082,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -181,7 +190,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1504,7 +1504,7 @@ Manufacturer "HP" +@@ -1524,7 +1524,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -190,7 +199,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1527,7 +1527,7 @@ Manufacturer "HP" +@@ -1547,7 +1547,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -199,7 +208,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1537,7 +1537,7 @@ Manufacturer "HP" +@@ -1557,7 +1557,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -208,7 +217,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1546,7 +1546,7 @@ Manufacturer "HP" +@@ -1566,7 +1566,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -217,7 +226,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1609,7 +1609,7 @@ Manufacturer "HP" +@@ -1629,7 +1629,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -226,7 +235,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1617,7 +1617,7 @@ Manufacturer "HP" +@@ -1637,7 +1637,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -235,7 +244,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1630,7 +1630,7 @@ Manufacturer "HP" +@@ -1650,7 +1650,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -244,7 +253,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1638,7 +1638,7 @@ Manufacturer "HP" +@@ -1658,7 +1658,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -253,7 +262,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1675,7 +1675,7 @@ Manufacturer "HP" +@@ -1695,7 +1695,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -262,7 +271,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1905,7 +1905,7 @@ Manufacturer "HP" +@@ -1925,7 +1925,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -271,7 +280,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1915,7 +1915,7 @@ Manufacturer "HP" +@@ -1935,7 +1935,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -280,7 +289,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1923,7 +1923,7 @@ Manufacturer "HP" +@@ -1943,7 +1943,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -289,7 +298,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1932,7 +1932,7 @@ Manufacturer "HP" +@@ -1952,7 +1952,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -298,7 +307,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2471,7 +2471,7 @@ Manufacturer "HP" +@@ -2465,7 +2465,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -307,7 +316,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_1600_series.ppd" Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" -@@ -2487,7 +2487,7 @@ Manufacturer "HP" +@@ -2481,7 +2481,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -316,7 +325,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2505,7 +2505,7 @@ Manufacturer "HP" +@@ -2499,7 +2499,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -325,7 +334,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2514,7 +2514,7 @@ Manufacturer "HP" +@@ -2508,7 +2508,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -334,7 +343,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2531,7 +2531,7 @@ Manufacturer "HP" +@@ -2525,7 +2525,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -343,7 +352,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2557,7 +2557,7 @@ Manufacturer "HP" +@@ -2551,7 +2551,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -352,7 +361,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3032,7 +3032,7 @@ Manufacturer "HP" +@@ -3012,7 +3012,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -361,7 +370,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3121,7 +3121,7 @@ Manufacturer "HP" +@@ -3085,7 +3085,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -370,7 +379,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3190,7 +3190,7 @@ Manufacturer "HP" +@@ -3140,7 +3140,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -379,7 +388,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3377,7 +3377,7 @@ Manufacturer "HP" +@@ -3309,7 +3309,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -388,16 +397,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3414,7 +3414,7 @@ Manufacturer "HP" - ModelName "HP Officejet 7300 Series" - Attribute "NickName" "" "HP Officejet 7300 Series, $Version" - Attribute "ShortNickName" "" "HP Officejet 7300 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7300 series;DES:officejet 7300 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7300 series;DES:officejet 7300 series;" - PCFileName "hp-officejet_7300_series.ppd" - Attribute "Product" "" "(HP Officejet 7310 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 7310xi All-in-one Printer)" -@@ -3462,7 +3462,7 @@ Manufacturer "HP" +@@ -3394,7 +3394,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -5273,7 +5273,7 @@ Manufacturer "HP" +@@ -7292,7 +7292,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -5283,7 +5283,7 @@ Manufacturer "HP" +@@ -7302,7 +7302,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -5475,7 +5475,7 @@ Manufacturer "HP" +@@ -7485,7 +7485,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3940" + Attribute "NickName" "" "HP Deskjet 3940, $Version" + Attribute "ShortNickName" "" "HP Deskjet 3940" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3940;DES:deskjet 3940;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:Deskjet 3900;DES:3940;" + PCFileName "hp-deskjet_3940.ppd" + Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" +@@ -7494,7 +7494,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -433,7 +442,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -5502,7 +5502,7 @@ Manufacturer "HP" +@@ -7521,7 +7521,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -442,7 +451,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -5800,7 +5800,7 @@ Manufacturer "HP" +@@ -7819,7 +7819,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -451,7 +460,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -5871,7 +5871,7 @@ Manufacturer "HP" +@@ -7890,7 +7890,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -460,7 +469,15 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -6835,7 +6835,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8387,6 +8387,7 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Photosmart 380 Series, $Version" + Attribute "ShortNickName" "" "HP Photosmart 380 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;" + PCFileName "hp-photosmart_380_series.ppd" + Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" + Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" +@@ -8814,7 +8815,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -469,7 +486,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -6861,7 +6861,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8840,7 +8841,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -478,7 +495,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -6869,7 +6869,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8848,7 +8849,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -487,7 +504,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -6879,7 +6879,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8858,7 +8859,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -496,7 +513,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -6887,7 +6887,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8866,7 +8867,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -505,7 +522,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -6899,7 +6899,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8878,7 +8879,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -514,7 +531,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -6907,7 +6907,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8886,7 +8887,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -523,7 +540,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -6917,7 +6917,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8896,7 +8897,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -532,7 +549,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -6959,7 +6959,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8938,7 +8939,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -541,7 +558,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -6977,7 +6977,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8956,7 +8957,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -550,7 +567,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -6994,7 +6994,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -559,7 +576,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -7002,7 +7002,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8981,7 +8982,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -568,7 +585,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -7027,7 +7027,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9006,7 +9007,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -577,7 +594,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -7035,7 +7035,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9014,7 +9015,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -586,7 +603,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -7060,7 +7060,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9039,7 +9040,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -595,7 +612,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -7157,7 +7157,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9063,7 +9064,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1320" + Attribute "NickName" "" "HP LaserJet 1320, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1320" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320;DES:hp laserjet 1320;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + PCFileName "hp-laserjet_1320.ppd" + Attribute "Product" "" "(HP LaserJet 1320 Printer)" + Attribute "Product" "" "(HP LaserJet 1320t Printer)" +@@ -9136,7 +9137,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -604,7 +630,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -7233,7 +7233,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9212,7 +9213,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -613,7 +639,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -7249,7 +7249,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9228,7 +9229,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -622,7 +648,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -9241,7 +9241,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9241,7 +9242,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -631,7 +657,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -7275,7 +7275,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9254,7 +9255,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -640,7 +666,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -7291,7 +7291,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9270,7 +9271,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -649,7 +675,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -7302,7 +7302,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9281,7 +9282,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -658,7 +684,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -7352,7 +7352,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9331,7 +9332,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -667,7 +693,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -7360,7 +7360,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9339,7 +9340,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -676,7 +702,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -7368,7 +7368,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9347,7 +9348,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -685,7 +711,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -7377,7 +7377,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9356,7 +9357,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -694,7 +720,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -7385,7 +7385,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9364,7 +9365,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -703,7 +729,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -7394,7 +7394,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9373,7 +9374,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -712,7 +738,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -7402,7 +7402,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9381,7 +9382,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -721,7 +747,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -7430,7 +7430,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9409,7 +9410,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -730,7 +756,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -7446,7 +7446,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9425,7 +9426,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -739,7 +765,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -7466,7 +7466,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9445,7 +9446,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -748,7 +774,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -7474,7 +7474,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9453,7 +9454,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -757,7 +783,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -7482,7 +7482,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9461,7 +9462,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -766,7 +792,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -7498,7 +7498,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9477,7 +9478,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -775,7 +801,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -7574,7 +7574,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9553,7 +9554,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" @@ -784,7 +810,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -7586,7 +7586,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" @@ -793,7 +819,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -7614,7 +7614,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9593,7 +9594,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -802,7 +828,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -7639,7 +7639,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9618,7 +9619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -811,7 +837,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -7651,7 +7651,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9630,7 +9631,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -820,7 +846,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -7664,7 +7664,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9643,7 +9644,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -829,7 +855,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -7675,7 +7675,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9654,7 +9655,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -838,7 +864,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -7746,7 +7746,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9725,7 +9726,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -847,7 +873,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -7856,7 +7856,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9835,7 +9836,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -856,7 +882,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -7892,7 +7892,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9871,7 +9872,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -865,7 +891,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -7913,7 +7913,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9892,7 +9893,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -874,7 +900,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -7921,7 +7921,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9900,7 +9901,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -883,7 +909,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -7982,7 +7982,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9961,7 +9962,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -892,7 +918,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -8259,7 +8259,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -901,7 +927,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -8428,7 +8428,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10360,7 +10361,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3800" + Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3800" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:HP Color LaserJet 3800;DES:HP Color LaserJet 3800;" + PCFileName "hp-color_laserjet_3800-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" +@@ -10407,7 +10408,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -910,7 +945,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -8441,7 +8441,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10420,7 +10421,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -919,7 +954,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -8539,7 +8539,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10518,7 +10519,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -928,7 +963,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -8580,7 +8580,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10559,7 +10560,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -937,7 +972,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -8872,7 +8872,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10851,7 +10852,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -946,7 +981,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -8880,7 +8880,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10859,7 +10860,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -955,7 +990,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -9088,7 +9088,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11067,7 +11068,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -964,7 +999,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -9252,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11231,7 +11232,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -973,7 +1008,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -9276,7 +9276,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11255,7 +11256,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -982,7 +1017,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -9293,7 +9293,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11272,7 +11273,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -991,7 +1026,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -9418,7 +9418,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11397,7 +11398,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1000,7 +1035,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -9434,7 +9434,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11413,7 +11414,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1009,7 +1044,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -9547,7 +9547,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11526,7 +11527,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1018,7 +1053,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -9569,7 +9569,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11548,7 +11549,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 500" Attribute "NickName" "" "HP Officejet Series 500, $Version" Attribute "ShortNickName" "" "HP Officejet Series 500" @@ -1027,7 +1062,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -9609,7 +9609,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11588,7 +11589,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1036,7 +1071,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -9661,7 +9661,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11640,7 +11641,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1045,7 +1080,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -9813,7 +9813,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11792,7 +11793,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1054,7 +1089,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -9837,7 +9837,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11816,7 +11817,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1063,7 +1098,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -9857,7 +9857,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11836,7 +11837,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1072,7 +1107,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -9917,7 +9917,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11896,7 +11897,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1081,7 +1116,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -10060,7 +10060,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12039,7 +12040,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, $Version" Attribute "ShortNickName" "" "HP Officejet T Series" @@ -1090,7 +1125,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -10071,7 +10071,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12050,7 +12051,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1099,7 +1134,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -10095,7 +10095,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12074,7 +12075,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1108,7 +1143,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -10103,7 +10103,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1117,7 +1152,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -10119,7 +10119,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12098,7 +12099,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1126,7 +1161,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -10127,7 +10127,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12106,7 +12107,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1135,7 +1170,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -10144,7 +10144,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12123,7 +12124,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1144,7 +1179,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -10152,7 +10152,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12131,7 +12132,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1153,7 +1188,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -10184,7 +10184,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12163,7 +12164,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1162,7 +1197,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -10192,7 +10192,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12171,7 +12172,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1171,7 +1206,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -10208,7 +10208,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12187,7 +12188,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1180,7 +1215,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -10217,7 +10217,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12196,7 +12197,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1189,7 +1224,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -10233,7 +10233,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12212,7 +12213,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1198,7 +1233,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -10350,7 +10350,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12329,7 +12330,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1207,7 +1242,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -10359,7 +10359,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1216,7 +1251,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -10470,7 +10470,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1225,7 +1260,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -10489,7 +10489,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1234,7 +1269,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -10500,7 +10500,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12479,7 +12480,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1243,7 +1278,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -10614,7 +10614,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12593,7 +12594,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1252,7 +1287,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -10623,7 +10623,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12602,7 +12603,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1261,7 +1296,25 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -11116,7 +11116,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1018" + Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1018" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1018;DES:HP LaserJet 1018;" + PCFileName "hp-laserjet_1018.ppd" + Attribute "Product" "" "(HP LaserJet 1018 Printer)" + Attribute "Product" "" "(HP LaserJet 1018s Printer)" +@@ -12753,7 +12754,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1020" + Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1020" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1020;DES:HP LaserJet 1020;" + PCFileName "hp-laserjet_1020.ppd" + Attribute "Product" "" "(HP LaserJet 1020 Printer)" + Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" +@@ -13095,7 +13096,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1270,7 +1323,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -11126,7 +11126,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13105,7 +13106,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1279,3 +1332,12 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } +@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p1006" + Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1006" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1006;DES:HP LaserJet P1006;" + PCFileName "hp-laserjet_p1006.ppd" + Attribute "Product" "" "(HP LaserJet p1006 Printer)" + } diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch new file mode 100644 index 0000000..c8f8ed2 --- /dev/null +++ b/hplip-deviceIDs-ppd.patch @@ -0,0 +1,143 @@ +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:01.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-01 15:41:31.000000000 +0200 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 1200)" + *Product: "(Hewlett-Packard HP LaserJet 1200)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:11.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-01 15:40:52.000000000 +0200 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 1200)" + *Product: "(Hewlett-Packard HP LaserJet 1200)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-08 17:44:22.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-08 17:44:38.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-08 17:44:43.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-08 17:44:48.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-08 17:44:53.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:23.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-01 15:39:35.000000000 +0200 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:36.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-01 15:39:58.000000000 +0200 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-08 17:45:10.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-08 17:45:15.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-08 17:45:19.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-08 17:45:25.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= diff --git a/hplip-laserjet_2300-deviceID.patch b/hplip-laserjet_2300-deviceID.patch deleted file mode 100644 index 5b46325..0000000 --- a/hplip-laserjet_2300-deviceID.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:32.000000000 +0100 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-03-26 16:16:30.000000000 +0100 -@@ -61,6 +61,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:35.000000000 +0100 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-03-26 16:16:38.000000000 +0100 -@@ -61,6 +61,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= diff --git a/hplip.spec b/hplip.spec index 3fca01a..7afabbe 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -18,7 +18,7 @@ Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch -Patch5: hplip-device-ids.patch +Patch5: hplip-deviceIDs-drv.patch Patch6: hplip-mucks-with-spooldir.patch Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch @@ -27,7 +27,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch -Patch17: hplip-laserjet_2300-deviceID.patch +Patch17: hplip-deviceIDs-ppd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. -%patch5 -p1 -b .device-ids +%patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files # directly (bug #552572). @@ -161,12 +161,20 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning -# Add Device ID for HP LaserJet 2300 (#576928) -gunzip prnt/ps/hp-laserjet_2300-ps.ppd.gz -gunzip prnt/ps/hp-laserjet_2300_series-ps.ppd.gz -%patch17 -p1 -b .laserjet_2300-deviceID -gzip -n prnt/ps/hp-laserjet_2300-ps.ppd -gzip -n prnt/ps/hp-laserjet_2300_series-ps.ppd +# Add Device ID for +# HP LaserJet 1200 (bug #577308) +# HP LaserJet 1320 series (bug #579920) +# HP LaserJet 2300 (bug #576928) +# HP LaserJet P2015 Series (bug #580231) +for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch17 -p1 -b .deviceIDs-ppd +for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ @@ -389,6 +397,11 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Fri Apr 9 2010 Jiri Popelka - 3.10.2-9 +- Added/Corrected several IEEE 1284 Device IDs + (bugs #577262, #577282, #577282, #577288, #577292, #577302, + ,#577306, #577308, #577898, #579920, #580231) + * Wed Apr 7 2010 Tim Waugh - 3.10.2-8 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). From 13bab8a88a6913f0eff976637fabc49e993016fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Fri, 9 Apr 2010 13:07:18 +0000 Subject: [PATCH 37/69] 3.10.2-9.1 - Used %{PATCH17} instead of referencing the patch file directly --- hplip.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hplip.spec b/hplip.spec index 7afabbe..8e216c3 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 9%{?dist} +Release: 9.1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -166,12 +166,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP LaserJet 1320 series (bug #579920) # HP LaserJet 2300 (bug #576928) # HP LaserJet P2015 Series (bug #580231) -for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4); +for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz done %patch17 -p1 -b .deviceIDs-ppd -for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4); +for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gzip -n ${ppd_file#*/} done @@ -397,7 +397,7 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog -* Fri Apr 9 2010 Jiri Popelka - 3.10.2-9 +* Fri Apr 9 2010 Jiri Popelka - 3.10.2-9.1 - Added/Corrected several IEEE 1284 Device IDs (bugs #577262, #577282, #577282, #577288, #577292, #577302, ,#577306, #577308, #577898, #579920, #580231) From c4743aff0d823b6ea0346ee52b30da2bac6bc95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Thu, 15 Apr 2010 15:34:38 +0000 Subject: [PATCH 38/69] - Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). --- hplip-skip-blank-lines.patch | 12 ++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 hplip-skip-blank-lines.patch diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch new file mode 100644 index 0000000..a301b9b --- /dev/null +++ b/hplip-skip-blank-lines.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines hplip-3.10.2/prnt/hpcups/Encapsulator.cpp +--- hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Encapsulator.cpp 2010-04-15 17:15:03.000000000 +0200 +@@ -191,7 +191,7 @@ DRIVER_ERROR Encapsulator::SendCAPy(int + { + DRIVER_ERROR err = NO_ERROR; + char str[12]; +- sprintf(str, "\x1b*b%dY", iOffset); ++ sprintf(str, "\x1b*p%dY", iOffset); + err = this->Send ((const BYTE *) str, strlen(str)); + return err; + } diff --git a/hplip.spec b/hplip.spec index 97f1200..02dbbcb 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch +Patch17: hplip-skip-blank-lines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -154,6 +155,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning +# Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). +%patch17 -p1 -b .skip-blank-lines + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -374,6 +378,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Apr 15 2010 Jiri Popelka - 3.10.2-5 +- Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). + * Wed Apr 7 2010 Tim Waugh - 3.10.2-4 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355). From ba855c25ecf457ada44a8f5a7bc0967fd86e5b7d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 15 Apr 2010 21:37:06 +0000 Subject: [PATCH 39/69] - Another try at fixing black/blank lines in ljcolor hpcups output (bug #579461). This time, try sending entire blank raster lines instead of skipping them. --- hplip-skip-blank-lines.patch | 23 +++++++++++------------ hplip.spec | 7 ++++++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch index a301b9b..288a887 100644 --- a/hplip-skip-blank-lines.patch +++ b/hplip-skip-blank-lines.patch @@ -1,12 +1,11 @@ -diff -up hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines hplip-3.10.2/prnt/hpcups/Encapsulator.cpp ---- hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Encapsulator.cpp 2010-04-15 17:15:03.000000000 +0200 -@@ -191,7 +191,7 @@ DRIVER_ERROR Encapsulator::SendCAPy(int - { - DRIVER_ERROR err = NO_ERROR; - char str[12]; -- sprintf(str, "\x1b*b%dY", iOffset); -+ sprintf(str, "\x1b*p%dY", iOffset); - err = this->Send ((const BYTE *) str, strlen(str)); - return err; - } +diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h +--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines 2010-02-24 23:04:09.000000000 +0000 ++++ hplip-3.10.2/prnt/hpcups/LJColor.h 2010-04-15 21:46:48.375754707 +0100 +@@ -48,6 +48,7 @@ public: + DRIVER_ERROR Configure(Pipeline **pipeline); + DRIVER_ERROR EndJob(); + DRIVER_ERROR FormFeed(); ++ bool CanSkipRasters() {return false;} + protected: + virtual DRIVER_ERROR addJobSettings(); + void configureRasterData(); diff --git a/hplip.spec b/hplip.spec index 02dbbcb..99f3690 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -378,6 +378,11 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Apr 15 2010 Tim Waugh - 3.10.2-6 +- Another try at fixing black/blank lines in ljcolor hpcups output + (bug #579461). This time, try sending entire blank raster lines + instead of skipping them. + * Thu Apr 15 2010 Jiri Popelka - 3.10.2-5 - Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). From 250bd31a360379ab8d5a892272a0dd78a49ec0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Fri, 16 Apr 2010 15:27:24 +0000 Subject: [PATCH 40/69] - Fixed black/blank lines in ljcolor hpcups output (bug #579461). Work-around is to send entire blank raster lines instead of skipping them. --- hplip-skip-blank-lines.patch | 11 +++++++++++ hplip.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 hplip-skip-blank-lines.patch diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch new file mode 100644 index 0000000..288a887 --- /dev/null +++ b/hplip-skip-blank-lines.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h +--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines 2010-02-24 23:04:09.000000000 +0000 ++++ hplip-3.10.2/prnt/hpcups/LJColor.h 2010-04-15 21:46:48.375754707 +0100 +@@ -48,6 +48,7 @@ public: + DRIVER_ERROR Configure(Pipeline **pipeline); + DRIVER_ERROR EndJob(); + DRIVER_ERROR FormFeed(); ++ bool CanSkipRasters() {return false;} + protected: + virtual DRIVER_ERROR addJobSettings(); + void configureRasterData(); diff --git a/hplip.spec b/hplip.spec index 8e216c3..0087cbd 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 9.1%{?dist} +Release: 10%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -28,6 +28,7 @@ Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch +Patch18: hplip-skip-blank-lines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -176,6 +177,9 @@ do gzip -n ${ppd_file#*/} done +# Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). +%patch18 -p1 -b .skip-blank-lines + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -397,6 +401,10 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Apr 16 2010 Jiri Popelka - 3.10.2-10 +- Fixed black/blank lines in ljcolor hpcups output (bug #579461). + Work-around is to send entire blank raster lines instead of skipping them. + * Fri Apr 9 2010 Jiri Popelka - 3.10.2-9.1 - Added/Corrected several IEEE 1284 Device IDs (bugs #577262, #577282, #577282, #577288, #577292, #577302, From 3b6c38c8e3e676e8878ab65847885615cde5d9b5 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 16 Apr 2010 17:27:33 +0000 Subject: [PATCH 41/69] - Corrected IEEE 1284 Device ID for HP PSC 2400 (bug #583103). --- hplip-deviceIDs-drv.patch | 2 +- hplip.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index c903dcb..7636f81 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -348,7 +348,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2400 Series;DES:psc 2400 series;" ++ Attribute "1284DeviceID" "" "MFG:hp;MDL:psc 2400 series;" PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" diff --git a/hplip.spec b/hplip.spec index 0087cbd..a867533 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -401,6 +401,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Fri Apr 16 2010 Tim Waugh - 3.10.2-11 +- Corrected IEEE 1284 Device ID for HP PSC 2400 (bug #583103). + * Thu Apr 16 2010 Jiri Popelka - 3.10.2-10 - Fixed black/blank lines in ljcolor hpcups output (bug #579461). Work-around is to send entire blank raster lines instead of skipping them. From c067ce7b06e79c94edd1679f2b4e88385a72649d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 16 Apr 2010 21:36:23 +0000 Subject: [PATCH 42/69] - Added/corrected more IEEE 1284 Device IDs: - HP Color LaserJet CM1312nfi (bug #581005). - HP Color LaserJet 3800 (bug #581935). - HP Color LaserJet 2840 (bug #582215). - HP PSC 2400 (bug #583103). --- hplip-deviceIDs-drv.patch | 15 ++++++-- hplip-deviceIDs-ppd.patch | 74 +++++++++++++++++++++++++-------------- hplip.spec | 11 +++++- 3 files changed, 70 insertions(+), 30 deletions(-) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 7636f81..adb7b17 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,6 +1,6 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in ---- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-25 00:09:42.000000000 +0100 -+++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-09 11:09:10.000000000 +0200 +--- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-24 23:09:42.000000000 +0000 ++++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-16 22:20:26.664147525 +0100 @@ -421,7 +421,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" @@ -918,6 +918,15 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" +@@ -10174,7 +10175,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm1312nfi MFP" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" + PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" + } @@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" @@ -932,7 +941,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" -+ Attribute "1284DeviceID" "" "MFG:HP;MDL:HP Color LaserJet 3800;DES:HP Color LaserJet 3800;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index c8f8ed2..971db2e 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -1,6 +1,28 @@ +diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2010-04-16 22:24:03.049147700 +0100 ++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd 2010-04-16 22:25:34.077147648 +0100 +@@ -46,6 +46,7 @@ + + *% Product Name and Version Information + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;" + *Product: "(HP Color LaserJet 2820)" + *Product: "(Hewlett-Packard HP Color LaserJet 2820)" + *Product: "(HP Color LaserJet 2830)" +diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2010-04-16 22:22:28.705273898 +0100 ++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd 2010-04-16 22:23:28.914273477 +0100 +@@ -51,6 +51,7 @@ + + *% Product Name and Version Information + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;" + *Product: "(HP Color LaserJet 3800)" + *Product: "(Hewlett-Packard HP Color LaserJet 3800)" + *ModelName: "HP Color LaserJet 3800" diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:01.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-01 15:41:31.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-16 22:21:49.286273004 +0100 @@ -56,6 +56,7 @@ *Product: "(HP LaserJet 1200)" *Product: "(Hewlett-Packard HP LaserJet 1200)" @@ -10,8 +32,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10. *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:11.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-01 15:40:52.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-16 22:21:49.292272590 +0100 @@ -56,6 +56,7 @@ *Product: "(HP LaserJet 1200)" *Product: "(Hewlett-Packard HP LaserJet 1200)" @@ -21,8 +43,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2 *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-08 17:44:22.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-16 22:21:49.300272653 +0100 @@ -57,6 +57,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" @@ -32,8 +54,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10. *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-08 17:44:38.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-16 22:21:49.304148148 +0100 @@ -57,6 +57,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" @@ -43,8 +65,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10 *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-08 17:44:43.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-16 22:21:49.317273026 +0100 @@ -57,6 +57,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" @@ -54,8 +76,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2 *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-08 17:44:48.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-16 22:21:49.321272466 +0100 @@ -57,6 +57,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" @@ -65,8 +87,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-08 17:44:53.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-16 22:21:49.334278100 +0100 @@ -57,6 +57,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" @@ -76,8 +98,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10 *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:23.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-01 15:39:35.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-16 22:21:49.342272544 +0100 @@ -61,6 +61,7 @@ *Product: "(Hewlett-Packard hp LaserJet 2300L)" *Product: "(HP LaserJet 2300L)" @@ -87,8 +109,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2 *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:36.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-01 15:39:58.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-16 22:21:49.346272524 +0100 @@ -61,6 +61,7 @@ *Product: "(Hewlett-Packard hp LaserJet 2300L)" *Product: "(HP LaserJet 2300L)" @@ -98,8 +120,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-08 17:45:10.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-16 22:21:49.356149235 +0100 @@ -64,6 +64,7 @@ *Product: "(HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" @@ -109,8 +131,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hp *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-08 17:45:15.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-16 22:21:49.367148274 +0100 @@ -64,6 +64,7 @@ *Product: "(HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" @@ -120,8 +142,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hpl *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-08 17:45:19.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-16 22:21:49.376148194 +0100 @@ -64,6 +64,7 @@ *Product: "(HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" @@ -131,8 +153,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hpli *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-08 17:45:25.000000000 +0200 +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-16 22:21:49.386147840 +0100 @@ -64,6 +64,7 @@ *Product: "(HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" diff --git a/hplip.spec b/hplip.spec index a867533..30ae6ed 100644 --- a/hplip.spec +++ b/hplip.spec @@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. +# HP Color LaserJet CM1312nfi (bug #581005). +# HP Color LaserJet 3800 (bug #581935). +# HP Color LaserJet 2840 (bug #582215). %patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files @@ -167,6 +170,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP LaserJet 1320 series (bug #579920) # HP LaserJet 2300 (bug #576928) # HP LaserJet P2015 Series (bug #580231) +# HP Color LaserJet 3800 (bug #581935). +# HP Color LaserJet 2840 (bug #582215). for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz @@ -402,7 +407,11 @@ fi %changelog * Fri Apr 16 2010 Tim Waugh - 3.10.2-11 -- Corrected IEEE 1284 Device ID for HP PSC 2400 (bug #583103). +- Added/corrected more IEEE 1284 Device IDs: + - HP Color LaserJet CM1312nfi (bug #581005). + - HP Color LaserJet 3800 (bug #581935). + - HP Color LaserJet 2840 (bug #582215). + - HP PSC 2400 (bug #583103). * Thu Apr 16 2010 Jiri Popelka - 3.10.2-10 - Fixed black/blank lines in ljcolor hpcups output (bug #579461). From 8f6299074fcbf58e3ce3fc213650b98bcf0a7c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Tue, 27 Apr 2010 11:03:49 +0000 Subject: [PATCH 43/69] - Added missing newline to string argument in dbglog() call (bug #585275). --- hplip-dbglog-newline.patch | 203 +++++++++++++++++++++++++++++++++++++ hplip.spec | 9 +- 2 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 hplip-dbglog-newline.patch diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch new file mode 100644 index 0000000..6f68837 --- /dev/null +++ b/hplip-dbglog-newline.patch @@ -0,0 +1,203 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-04-27 12:20:42.000000000 +0200 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-27 12:38:09.000000000 +0200 +@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + (attr->value != NULL)) { + strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value); + } + } + +@@ -365,7 +365,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + } + strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Language, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value); + } + + // Fill in the other PCL header info +@@ -410,14 +410,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + { + if (err == PLUGIN_LIBRARY_MISSING) + fputs ("STATE: +hplip.plugin-error\n", stderr); +- dbglog ("m_Job initialization failed with error = %d", err); ++ dbglog ("m_Job initialization failed with error = %d\n", err); + ppdClose(m_ppd); + m_ppd = NULL; + return err; + } + + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: returning NO_ERROR from startPage"); ++ dbglog("HPCUPS: returning NO_ERROR from startPage\n"); + } + + m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; +@@ -495,7 +495,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); ++ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err); + closeFilter(); + cupsRasterClose(cups_raster); + return 1; +@@ -505,7 +505,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); ++ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n"); + closeFilter(); + cupsRasterClose(cups_raster); + return 0; +diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Lidil.cpp +--- hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Lidil.cpp 2010-04-27 12:38:08.000000000 +0200 +@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -167,13 +167,13 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -188,7 +188,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + err = allocateSwathBuffers(); + if (err != NO_ERROR) + { +- dbglog("allocateSwathBuffers failed, err = %d", err); ++ dbglog("allocateSwathBuffers failed, err = %d\n", err); + return err; + } + +@@ -577,7 +577,7 @@ bool Lidil::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(lidil_print_modes_table) / sizeof(lidil_print_modes_table[0]); i++) +@@ -587,7 +587,7 @@ bool Lidil::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3.cpp +--- hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Pcl3.cpp 2010-04-27 12:38:07.000000000 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -220,7 +220,7 @@ void Pcl3::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -255,7 +255,7 @@ bool Pcl3::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_print_modes_table) / sizeof(pcl3_print_modes_table[0]); i++) +@@ -265,7 +265,7 @@ bool Pcl3::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -up hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp 2010-04-27 12:38:06.000000000 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -224,7 +224,7 @@ void Pcl3Gui::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -259,7 +259,7 @@ bool Pcl3Gui::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_gui_print_modes_table) / sizeof(pcl3_gui_print_modes_table[0]); i++) +@@ -269,7 +269,7 @@ bool Pcl3Gui::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + diff --git a/hplip.spec b/hplip.spec index 99f3690..0b3d5f7 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -27,6 +27,7 @@ Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-skip-blank-lines.patch +Patch18: hplip-dbglog-newline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -158,6 +159,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). %patch17 -p1 -b .skip-blank-lines +# Added missing newline to string argument in dbglog() call (bug #585275). +%patch18 -p1 -b .dbglog-newline + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -378,6 +382,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue Apr 27 2010 Jiri Popelka - 3.10.2-7 +- Added missing newline to string argument in dbglog() call (bug #585275). + * Thu Apr 15 2010 Tim Waugh - 3.10.2-6 - Another try at fixing black/blank lines in ljcolor hpcups output (bug #579461). This time, try sending entire blank raster lines From ecb4a8c618c7de4538eacc64a5ac93508bbf34fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Tue, 27 Apr 2010 11:04:00 +0000 Subject: [PATCH 44/69] - Added missing newline to string argument in dbglog() call (bug #585275). --- hplip-dbglog-newline.patch | 203 +++++++++++++++++++++++++++++++++++++ hplip.spec | 9 +- 2 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 hplip-dbglog-newline.patch diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch new file mode 100644 index 0000000..6f68837 --- /dev/null +++ b/hplip-dbglog-newline.patch @@ -0,0 +1,203 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-04-27 12:20:42.000000000 +0200 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-27 12:38:09.000000000 +0200 +@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + (attr->value != NULL)) { + strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value); + } + } + +@@ -365,7 +365,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + } + strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Language, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value); + } + + // Fill in the other PCL header info +@@ -410,14 +410,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + { + if (err == PLUGIN_LIBRARY_MISSING) + fputs ("STATE: +hplip.plugin-error\n", stderr); +- dbglog ("m_Job initialization failed with error = %d", err); ++ dbglog ("m_Job initialization failed with error = %d\n", err); + ppdClose(m_ppd); + m_ppd = NULL; + return err; + } + + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: returning NO_ERROR from startPage"); ++ dbglog("HPCUPS: returning NO_ERROR from startPage\n"); + } + + m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; +@@ -495,7 +495,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); ++ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err); + closeFilter(); + cupsRasterClose(cups_raster); + return 1; +@@ -505,7 +505,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); ++ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n"); + closeFilter(); + cupsRasterClose(cups_raster); + return 0; +diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Lidil.cpp +--- hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Lidil.cpp 2010-04-27 12:38:08.000000000 +0200 +@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -167,13 +167,13 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -188,7 +188,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + err = allocateSwathBuffers(); + if (err != NO_ERROR) + { +- dbglog("allocateSwathBuffers failed, err = %d", err); ++ dbglog("allocateSwathBuffers failed, err = %d\n", err); + return err; + } + +@@ -577,7 +577,7 @@ bool Lidil::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(lidil_print_modes_table) / sizeof(lidil_print_modes_table[0]); i++) +@@ -587,7 +587,7 @@ bool Lidil::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3.cpp +--- hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Pcl3.cpp 2010-04-27 12:38:07.000000000 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -220,7 +220,7 @@ void Pcl3::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -255,7 +255,7 @@ bool Pcl3::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_print_modes_table) / sizeof(pcl3_print_modes_table[0]); i++) +@@ -265,7 +265,7 @@ bool Pcl3::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -up hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp 2010-04-27 12:38:06.000000000 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -224,7 +224,7 @@ void Pcl3Gui::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -259,7 +259,7 @@ bool Pcl3Gui::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_gui_print_modes_table) / sizeof(pcl3_gui_print_modes_table[0]); i++) +@@ -269,7 +269,7 @@ bool Pcl3Gui::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + diff --git a/hplip.spec b/hplip.spec index 30ae6ed..f4f1aa0 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -29,6 +29,7 @@ Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch +Patch19: hplip-dbglog-newline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -185,6 +186,9 @@ done # Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). %patch18 -p1 -b .skip-blank-lines +# Added missing newline to string argument in dbglog() call (bug #585275). +%patch19 -p1 -b .dbglog-newline + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -406,6 +410,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue Apr 27 2010 Jiri Popelka - 3.10.2-12 +- Added missing newline to string argument in dbglog() call (bug #585275). + * Fri Apr 16 2010 Tim Waugh - 3.10.2-11 - Added/corrected more IEEE 1284 Device IDs: - HP Color LaserJet CM1312nfi (bug #581005). From 2d4ff3449424eff5f6a0987a9b4461d3477e850b Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 28 Apr 2010 12:00:40 +0000 Subject: [PATCH 45/69] - Clear old printer-state-reasons we used to manage (bug #510926). --- hplip-clear-old-state-reasons.patch | 18 ++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 hplip-clear-old-state-reasons.patch diff --git a/hplip-clear-old-state-reasons.patch b/hplip-clear-old-state-reasons.patch new file mode 100644 index 0000000..3d8852e --- /dev/null +++ b/hplip-clear-old-state-reasons.patch @@ -0,0 +1,18 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons 2010-04-28 12:23:08.296730566 +0100 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-28 12:25:25.493730293 +0100 +@@ -479,6 +479,14 @@ int HPCupsFilter::StartPrintJob(int arg + + signal(SIGTERM, HPCancelJob); + ++/* ++ * Prior to the re-write of hpcups, this filter managed the ++ * marker-supply-low-warning printer state reason. Make sure to ++ * clear that state reason so that upgrades work correctly. ++ */ ++ ++ fputs ("STATE: -marker-supply-low-warning\n", stderr); ++ + cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ); + + if (cups_raster == NULL) { diff --git a/hplip.spec b/hplip.spec index 0b3d5f7..e5418de 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,6 +24,7 @@ Patch7: hplip-tray-icon-crash.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch +Patch12: hplip-clear-old-state-reasons.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-skip-blank-lines.patch @@ -150,6 +151,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected +# Clear old printer-state-reasons we used to manage (bug #510926). +%patch12 -p1 -b .clear-old-state-reasons + # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -382,6 +386,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed Apr 28 2010 Tim Waugh - 3.10.2-8 +- Clear old printer-state-reasons we used to manage (bug #510926). + * Tue Apr 27 2010 Jiri Popelka - 3.10.2-7 - Added missing newline to string argument in dbglog() call (bug #585275). From ae96310a1365d09bbfd557646393529c77153a2d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 28 Apr 2010 12:03:00 +0000 Subject: [PATCH 46/69] - Clear old printer-state-reasons we used to manage (bug #510926). --- hplip-clear-old-state-reasons.patch | 18 ++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 hplip-clear-old-state-reasons.patch diff --git a/hplip-clear-old-state-reasons.patch b/hplip-clear-old-state-reasons.patch new file mode 100644 index 0000000..3d8852e --- /dev/null +++ b/hplip-clear-old-state-reasons.patch @@ -0,0 +1,18 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons 2010-04-28 12:23:08.296730566 +0100 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-28 12:25:25.493730293 +0100 +@@ -479,6 +479,14 @@ int HPCupsFilter::StartPrintJob(int arg + + signal(SIGTERM, HPCancelJob); + ++/* ++ * Prior to the re-write of hpcups, this filter managed the ++ * marker-supply-low-warning printer state reason. Make sure to ++ * clear that state reason so that upgrades work correctly. ++ */ ++ ++ fputs ("STATE: -marker-supply-low-warning\n", stderr); ++ + cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ); + + if (cups_raster == NULL) { diff --git a/hplip.spec b/hplip.spec index f4f1aa0..e74fd9d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -25,6 +25,7 @@ Patch8: hplip-retry-open.patch Patch9: hplip-tray-icon-crash.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch +Patch12: hplip-clear-old-state-reasons.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch @@ -160,6 +161,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected +# Clear old printer-state-reasons we used to manage (bug #510926). +%patch12 -p1 -b .clear-old-state-reasons + # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -410,6 +414,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed Apr 28 2010 Tim Waugh - 3.10.2-13 +- Clear old printer-state-reasons we used to manage (bug #510926). + * Tue Apr 27 2010 Jiri Popelka - 3.10.2-12 - Added missing newline to string argument in dbglog() call (bug #585275). From fc4a78f11483015da349cdfd44d0e9c423a25892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Tue, 11 May 2010 13:54:46 +0000 Subject: [PATCH 47/69] - Wait for max 30s to see if a system tray becomes available (bug #569969). --- hplip-no-system-tray.patch | 20 ++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 hplip-no-system-tray.patch diff --git a/hplip-no-system-tray.patch b/hplip-no-system-tray.patch new file mode 100644 index 0000000..a3ae50f --- /dev/null +++ b/hplip-no-system-tray.patch @@ -0,0 +1,20 @@ +diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py +--- hplip-3.10.2/ui4/systemtray.py.no-system-tray 2010-05-11 14:40:57.000000000 +0200 ++++ hplip-3.10.2/ui4/systemtray.py 2010-05-11 15:25:20.000000000 +0200 +@@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000 + BLIP_DELAY = 2000 + SET_MENU_DELAY = 1000 + MAX_MENU_EVENTS = 10 ++TRAY_AVAILABLE_DELAY = 30 + + ERROR_STATE_TO_ICON = { + ERROR_STATE_CLEAR: QSystemTrayIcon.Information, +@@ -707,7 +708,7 @@ def run(read_pipe): + app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app + + i = 0 +- while i < 10: ++ while i < TRAY_AVAILABLE_DELAY: + if QSystemTrayIcon.isSystemTrayAvailable(): + break + time.sleep(1.0) diff --git a/hplip.spec b/hplip.spec index e5418de..5452fca 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -29,6 +29,7 @@ Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-skip-blank-lines.patch Patch18: hplip-dbglog-newline.patch +Patch19: hplip-no-system-tray.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -166,6 +167,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Added missing newline to string argument in dbglog() call (bug #585275). %patch18 -p1 -b .dbglog-newline +# Wait for max 30s to see if a system tray becomes available (bug #569969). +%patch19 -p1 -b .no-system-tray + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -386,6 +390,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue May 11 2010 Jiri Popelka - 3.10.2-9 +- Wait for max 30s to see if a system tray becomes available (bug #569969). + * Wed Apr 28 2010 Tim Waugh - 3.10.2-8 - Clear old printer-state-reasons we used to manage (bug #510926). From 785fffb16b9031451f086040201c5336406b149c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Wed, 12 May 2010 08:26:39 +0000 Subject: [PATCH 48/69] - Wait for max 30s to see if a system tray becomes available (bug #569969). --- hplip-no-system-tray.patch | 20 ++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 hplip-no-system-tray.patch diff --git a/hplip-no-system-tray.patch b/hplip-no-system-tray.patch new file mode 100644 index 0000000..a3ae50f --- /dev/null +++ b/hplip-no-system-tray.patch @@ -0,0 +1,20 @@ +diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py +--- hplip-3.10.2/ui4/systemtray.py.no-system-tray 2010-05-11 14:40:57.000000000 +0200 ++++ hplip-3.10.2/ui4/systemtray.py 2010-05-11 15:25:20.000000000 +0200 +@@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000 + BLIP_DELAY = 2000 + SET_MENU_DELAY = 1000 + MAX_MENU_EVENTS = 10 ++TRAY_AVAILABLE_DELAY = 30 + + ERROR_STATE_TO_ICON = { + ERROR_STATE_CLEAR: QSystemTrayIcon.Information, +@@ -707,7 +708,7 @@ def run(read_pipe): + app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app + + i = 0 +- while i < 10: ++ while i < TRAY_AVAILABLE_DELAY: + if QSystemTrayIcon.isSystemTrayAvailable(): + break + time.sleep(1.0) diff --git a/hplip.spec b/hplip.spec index e74fd9d..421526f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -31,6 +31,7 @@ Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch +Patch20: hplip-no-system-tray.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -193,6 +194,9 @@ done # Added missing newline to string argument in dbglog() call (bug #585275). %patch19 -p1 -b .dbglog-newline +# Wait for max 30s to see if a system tray becomes available (bug #569969). +%patch20 -p1 -b .no-system-tray + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -414,6 +418,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed May 12 2010 Jiri Popelka - 3.10.2-14 +- Wait for max 30s to see if a system tray becomes available (bug #569969). + * Wed Apr 28 2010 Tim Waugh - 3.10.2-13 - Clear old printer-state-reasons we used to manage (bug #510926). From 4578e978a611758687da146c56f1404414bd2652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Wed, 12 May 2010 10:27:29 +0000 Subject: [PATCH 49/69] - Added/corrected more IEEE 1284 Device IDs: - HP LaserJet 4250 (bug #585499). - HP Color LaserJet 2605dn (bug #583953). - HP LaserJet P1007 (bug #585272). --- hplip-deviceIDs-drv.patch | 9 +++++++++ hplip-deviceIDs-ppd.patch | 22 ++++++++++++++++++++++ hplip.spec | 11 ++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index adb7b17..a34e93d 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1350,3 +1350,12 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } +@@ -13407,7 +13408,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p1007" + Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1007" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;" + PCFileName "hp-laserjet_p1007.ppd" + Attribute "Product" "" "(HP LaserJet p1007 Printer)" + } diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index 971db2e..a3e9671 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -1,3 +1,25 @@ +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2010-05-12 11:56:17.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd 2010-05-12 11:58:30.000000000 +0200 +@@ -53,6 +53,7 @@ + *HPPDEPanel: "HPImagingOptions" + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" + *Product: "(hp LaserJet 4250)" + *Product: "(Hewlett-Packard hp LaserJet 4250)" + *Product: "(HP LaserJet 4250)" +diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2010-05-12 11:36:35.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2010-05-12 11:39:06.000000000 +0200 +@@ -50,6 +50,7 @@ + + *% Product Name and Version Information + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;" + *Product: "(HP Color LaserJet 2605)" + *Product: "(Hewlett-Packard HP Color LaserJet 2605)" + *Product: "(HP Color LaserJet 2605dn)" diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd --- hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2010-04-16 22:24:03.049147700 +0100 +++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd 2010-04-16 22:25:34.077147648 +0100 diff --git a/hplip.spec b/hplip.spec index 421526f..7a3bc46 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -140,6 +140,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP Color LaserJet CM1312nfi (bug #581005). # HP Color LaserJet 3800 (bug #581935). # HP Color LaserJet 2840 (bug #582215). +# HP LaserJet P1007 (bug #585272). %patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files @@ -178,6 +179,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP LaserJet P2015 Series (bug #580231) # HP Color LaserJet 3800 (bug #581935). # HP Color LaserJet 2840 (bug #582215). +# HP LaserJet 4250 (bug #585499). +# HP Color LaserJet 2605dn (bug #583953). for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz @@ -418,6 +421,12 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed May 12 2010 Jiri Popelka - 3.10.2-15 +- Added/corrected more IEEE 1284 Device IDs: + - HP LaserJet 4250 (bug #585499). + - HP Color LaserJet 2605dn (bug #583953). + - HP LaserJet P1007 (bug #585272). + * Wed May 12 2010 Jiri Popelka - 3.10.2-14 - Wait for max 30s to see if a system tray becomes available (bug #569969). From 38a666f5196722e90fd2b6603b4395317453b79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Wed, 12 May 2010 15:44:12 +0000 Subject: [PATCH 50/69] - Prevent segfault in cupsext when opening PPD file (bug #572775). --- hplip-openPPD.patch | 24 ++++++++++++++++++++++++ hplip.spec | 10 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 hplip-openPPD.patch diff --git a/hplip-openPPD.patch b/hplip-openPPD.patch new file mode 100644 index 0000000..7ccf2d0 --- /dev/null +++ b/hplip-openPPD.patch @@ -0,0 +1,24 @@ +diff -up hplip-3.10.2/prnt/cupsext/cupsext.c.openPPD hplip-3.10.2/prnt/cupsext/cupsext.c +--- hplip-3.10.2/prnt/cupsext/cupsext.c.openPPD 2010-02-25 00:04:58.000000000 +0100 ++++ hplip-3.10.2/prnt/cupsext/cupsext.c 2010-03-17 19:54:19.000000000 +0100 +@@ -1221,9 +1221,18 @@ PyObject * openPPD( PyObject * self, PyO + return Py_BuildValue( "" ); // None + } + +- g_ppd_file = cupsGetPPD( ( const char * ) printer ); ++ if ( ( g_ppd_file = cupsGetPPD( ( const char * ) printer ) ) == NULL ) ++ { ++ goto bailout; ++ } ++ ++ if ( ( file = fopen( g_ppd_file, "r" )) == NULL ) ++ { ++ unlink(g_ppd_file); ++ g_ppd_file = NULL; ++ goto bailout; ++ } + +- file = fopen( g_ppd_file, "r" ); + ppd = ppdOpen( file ); + ppdLocalize( ppd ); + fclose( file ); diff --git a/hplip.spec b/hplip.spec index 5452fca..e81bdf5 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -30,6 +30,8 @@ Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-skip-blank-lines.patch Patch18: hplip-dbglog-newline.patch Patch19: hplip-no-system-tray.patch +Patch20: hplip-openPPD.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Wait for max 30s to see if a system tray becomes available (bug #569969). %patch19 -p1 -b .no-system-tray +# Prevent segfault in cupsext when opening PPD file (bug #572775). +%patch20 -p1 -b .openPPD + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -390,6 +395,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed May 12 2010 Jiri Popelka - 3.10.2-10 +- Prevent segfault in cupsext when opening PPD file (bug #572775). + * Tue May 11 2010 Jiri Popelka - 3.10.2-9 - Wait for max 30s to see if a system tray becomes available (bug #569969). From ded481dbb42cf83386675ba49b44632d37098f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Wed, 12 May 2010 15:44:24 +0000 Subject: [PATCH 51/69] - Prevent segfault in cupsext when opening PPD file (bug #572775). --- hplip-openPPD.patch | 24 ++++++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 hplip-openPPD.patch diff --git a/hplip-openPPD.patch b/hplip-openPPD.patch new file mode 100644 index 0000000..7ccf2d0 --- /dev/null +++ b/hplip-openPPD.patch @@ -0,0 +1,24 @@ +diff -up hplip-3.10.2/prnt/cupsext/cupsext.c.openPPD hplip-3.10.2/prnt/cupsext/cupsext.c +--- hplip-3.10.2/prnt/cupsext/cupsext.c.openPPD 2010-02-25 00:04:58.000000000 +0100 ++++ hplip-3.10.2/prnt/cupsext/cupsext.c 2010-03-17 19:54:19.000000000 +0100 +@@ -1221,9 +1221,18 @@ PyObject * openPPD( PyObject * self, PyO + return Py_BuildValue( "" ); // None + } + +- g_ppd_file = cupsGetPPD( ( const char * ) printer ); ++ if ( ( g_ppd_file = cupsGetPPD( ( const char * ) printer ) ) == NULL ) ++ { ++ goto bailout; ++ } ++ ++ if ( ( file = fopen( g_ppd_file, "r" )) == NULL ) ++ { ++ unlink(g_ppd_file); ++ g_ppd_file = NULL; ++ goto bailout; ++ } + +- file = fopen( g_ppd_file, "r" ); + ppd = ppdOpen( file ); + ppdLocalize( ppd ); + fclose( file ); diff --git a/hplip.spec b/hplip.spec index 7a3bc46..ba614da 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -32,6 +32,7 @@ Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch Patch20: hplip-no-system-tray.patch +Patch21: hplip-openPPD.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -200,6 +201,9 @@ done # Wait for max 30s to see if a system tray becomes available (bug #569969). %patch20 -p1 -b .no-system-tray +# Prevent segfault in cupsext when opening PPD file (bug #572775). +%patch21 -p1 -b .openPPD + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -421,6 +425,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed May 12 2010 Jiri Popelka - 3.10.2-16 +- Prevent segfault in cupsext when opening PPD file (bug #572775). + * Wed May 12 2010 Jiri Popelka - 3.10.2-15 - Added/corrected more IEEE 1284 Device IDs: - HP LaserJet 4250 (bug #585499). From b4e3212ea8cd17fa5c9c053c211fad6bd83b38f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Mon, 17 May 2010 14:23:03 +0000 Subject: [PATCH 52/69] - 3.10.5. No longer need tray-icon-crash.patch - Increase the timeout for system tray availability checking (bug #569969). --- .cvsignore | 1 + hplip-3.10.2.tar.gz.asc | 7 - hplip-3.10.5.tar.gz.asc | 7 + hplip-bad-low-ink-warning.patch | 14 +- hplip-dbglog-newline.patch | 28 +-- hplip-deviceIDs-drv.patch | 308 ++++++++++++++++---------------- hplip-no-system-tray.patch | 12 +- hplip-pstotiff-is-rubbish.patch | 13 +- hplip-tray-icon-crash.patch | 11 -- hplip-udev-rules.patch | 15 +- hplip.spec | 20 +-- sources | 2 +- 12 files changed, 214 insertions(+), 224 deletions(-) delete mode 100644 hplip-3.10.2.tar.gz.asc create mode 100644 hplip-3.10.5.tar.gz.asc delete mode 100644 hplip-tray-icon-crash.patch diff --git a/.cvsignore b/.cvsignore index 8a6d5d9..5b20f8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -34,3 +34,4 @@ hplip-3.9.10.tar.gz hplip-3.9.12.tar.gz hplip-3.10.2.tar.gz hpcups-update-ppds.sh +hplip-3.10.5.tar.gz diff --git a/hplip-3.10.2.tar.gz.asc b/hplip-3.10.2.tar.gz.asc deleted file mode 100644 index a227003..0000000 --- a/hplip-3.10.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkuFslQACgkQc9dwzaWQR7mpowCgr3YlpISS+6eqBhwkTIdOhc3b -470An0hYImtLZznLX6oljo/gw4zCoqvh -=dMK4 ------END PGP SIGNATURE----- diff --git a/hplip-3.10.5.tar.gz.asc b/hplip-3.10.5.tar.gz.asc new file mode 100644 index 0000000..662f63e --- /dev/null +++ b/hplip-3.10.5.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ +wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U +=H4Nc +-----END PGP SIGNATURE----- diff --git a/hplip-bad-low-ink-warning.patch b/hplip-bad-low-ink-warning.patch index 6bc0d8b..bd51d64 100644 --- a/hplip-bad-low-ink-warning.patch +++ b/hplip-bad-low-ink-warning.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp ---- hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2009-11-26 14:30:31.325303260 +0000 -+++ hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp 2009-11-26 14:31:10.125303367 +0000 -@@ -2222,7 +2222,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +diff -up hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp +--- hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2010-05-13 01:48:58.000000000 +0200 ++++ hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp 2010-05-17 14:56:31.000000000 +0200 +@@ -2239,7 +2239,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() { case '5': { @@ -10,7 +10,7 @@ diff -up hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.10/p { if (err != NO_ERROR) { -@@ -2237,7 +2237,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +@@ -2254,7 +2254,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() } case '6': { @@ -19,7 +19,7 @@ diff -up hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.10/p { if (err != NO_ERROR) { -@@ -2252,7 +2252,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +@@ -2269,7 +2269,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() } case '7': { @@ -28,7 +28,7 @@ diff -up hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.10/p { if (err != NO_ERROR) { -@@ -2268,7 +2268,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +@@ -2285,7 +2285,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() } case '8': { diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch index 6f68837..00b4623 100644 --- a/hplip-dbglog-newline.patch +++ b/hplip-dbglog-newline.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-04-27 12:20:42.000000000 +0200 -+++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-27 12:38:09.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-05-17 15:00:02.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu (attr->value != NULL)) { strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); @@ -36,7 +36,7 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/p } m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; -@@ -495,7 +495,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -503,7 +503,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -45,7 +45,7 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/p closeFilter(); cupsRasterClose(cups_raster); return 1; -@@ -505,7 +505,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -513,7 +513,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -54,9 +54,9 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/p closeFilter(); cupsRasterClose(cups_raster); return 0; -diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Lidil.cpp ---- hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Lidil.cpp 2010-04-27 12:38:08.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Lidil.cpp +--- hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/Lidil.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * if (m_pPM->BaseResX != m_pQA->horizontal_resolution || m_pPM->BaseResY != m_pQA->vertical_resolution) @@ -109,9 +109,9 @@ diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpc return false; } -diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3.cpp ---- hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Pcl3.cpp 2010-04-27 12:38:07.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3.cpp +--- hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/Pcl3.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** if (!selectPrintMode()) @@ -155,9 +155,9 @@ diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcu return false; } -diff -up hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp ---- hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp 2010-04-27 12:38:06.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline if (!selectPrintMode()) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index a34e93d..5f7c42c 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in ---- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-24 23:09:42.000000000 +0000 -+++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-16 22:20:26.664147525 +0100 -@@ -421,7 +421,7 @@ Manufacturer "HP" +diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv/hpcups.drv.in +--- hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-05-13 01:47:57.000000000 +0200 ++++ hplip-3.10.5/prnt/drv/hpcups.drv.in 2010-05-17 14:46:45.000000000 +0200 +@@ -424,7 +424,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -429,7 +429,7 @@ Manufacturer "HP" +@@ -432,7 +432,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -446,7 +446,7 @@ Manufacturer "HP" +@@ -449,7 +449,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -494,7 +494,7 @@ Manufacturer "HP" +@@ -497,7 +497,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -510,7 +510,7 @@ Manufacturer "HP" +@@ -513,7 +513,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -526,7 +526,7 @@ Manufacturer "HP" +@@ -529,7 +529,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -534,7 +534,7 @@ Manufacturer "HP" +@@ -537,7 +537,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -566,7 +566,7 @@ Manufacturer "HP" +@@ -569,7 +569,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -582,7 +582,7 @@ Manufacturer "HP" +@@ -585,7 +585,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -601,7 +601,7 @@ Manufacturer "HP" +@@ -604,7 +604,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -642,7 +642,7 @@ Manufacturer "HP" +@@ -645,7 +645,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -661,7 +661,7 @@ Manufacturer "HP" +@@ -664,7 +664,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -718,7 +718,7 @@ Manufacturer "HP" +@@ -721,7 +721,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" @@ -118,7 +118,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -726,7 +726,7 @@ Manufacturer "HP" +@@ -729,7 +729,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -127,7 +127,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -746,7 +746,7 @@ Manufacturer "HP" +@@ -749,7 +749,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +136,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -755,7 +755,7 @@ Manufacturer "HP" +@@ -758,7 +758,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +145,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -789,7 +789,7 @@ Manufacturer "HP" +@@ -792,7 +792,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +154,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -827,7 +827,7 @@ Manufacturer "HP" +@@ -830,7 +830,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +163,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -835,7 +835,7 @@ Manufacturer "HP" +@@ -838,7 +838,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,7 +172,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -886,7 +886,7 @@ Manufacturer "HP" +@@ -889,7 +889,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -181,7 +181,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1082,7 +1082,7 @@ Manufacturer "HP" +@@ -1085,7 +1085,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -190,7 +190,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1524,7 +1524,7 @@ Manufacturer "HP" +@@ -1527,7 +1527,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -199,7 +199,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1547,7 +1547,7 @@ Manufacturer "HP" +@@ -1550,7 +1550,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +208,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1557,7 +1557,7 @@ Manufacturer "HP" +@@ -1560,7 +1560,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +217,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1566,7 +1566,7 @@ Manufacturer "HP" +@@ -1569,7 +1569,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +226,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1629,7 +1629,7 @@ Manufacturer "HP" +@@ -1632,7 +1632,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,7 +235,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1637,7 +1637,7 @@ Manufacturer "HP" +@@ -1640,7 +1640,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -244,7 +244,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1650,7 +1650,7 @@ Manufacturer "HP" +@@ -1653,7 +1653,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -253,7 +253,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1658,7 +1658,7 @@ Manufacturer "HP" +@@ -1661,7 +1661,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -262,7 +262,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1695,7 +1695,7 @@ Manufacturer "HP" +@@ -1698,7 +1698,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,7 +271,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1925,7 +1925,7 @@ Manufacturer "HP" +@@ -1928,7 +1928,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -280,7 +280,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1935,7 +1935,7 @@ Manufacturer "HP" +@@ -1938,7 +1938,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -289,7 +289,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1943,7 +1943,7 @@ Manufacturer "HP" +@@ -1946,7 +1946,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -298,7 +298,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1952,7 +1952,7 @@ Manufacturer "HP" +@@ -1955,7 +1955,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -307,7 +307,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2465,7 +2465,7 @@ Manufacturer "HP" +@@ -2476,7 +2476,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_1600_series.ppd" Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" -@@ -2481,7 +2481,7 @@ Manufacturer "HP" +@@ -2492,7 +2492,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2499,7 +2499,7 @@ Manufacturer "HP" +@@ -2510,7 +2510,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -334,7 +334,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2508,7 +2508,7 @@ Manufacturer "HP" +@@ -2519,7 +2519,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -343,7 +343,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2525,7 +2525,7 @@ Manufacturer "HP" +@@ -2536,7 +2536,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -352,7 +352,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2551,7 +2551,7 @@ Manufacturer "HP" +@@ -2562,7 +2562,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -361,7 +361,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3012,7 +3012,7 @@ Manufacturer "HP" +@@ -3023,7 +3023,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -370,7 +370,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3085,7 +3085,7 @@ Manufacturer "HP" +@@ -3096,7 +3096,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -379,7 +379,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3140,7 +3140,7 @@ Manufacturer "HP" +@@ -3151,7 +3151,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -388,7 +388,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3309,7 +3309,7 @@ Manufacturer "HP" +@@ -3320,7 +3320,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3394,7 +3394,7 @@ Manufacturer "HP" +@@ -3405,7 +3405,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -7292,7 +7292,7 @@ Manufacturer "HP" +@@ -7327,7 +7327,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -7302,7 +7302,7 @@ Manufacturer "HP" +@@ -7337,7 +7337,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -7485,7 +7485,7 @@ Manufacturer "HP" +@@ -7520,7 +7520,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -433,7 +433,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -7494,7 +7494,7 @@ Manufacturer "HP" +@@ -7529,7 +7529,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -7521,7 +7521,7 @@ Manufacturer "HP" +@@ -7556,7 +7556,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -7819,7 +7819,7 @@ Manufacturer "HP" +@@ -7854,7 +7854,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -7890,7 +7890,7 @@ Manufacturer "HP" +@@ -7925,7 +7925,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -469,7 +469,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -8387,6 +8387,7 @@ Manufacturer "HP" +@@ -8422,6 +8422,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -477,7 +477,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -8814,7 +8815,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8849,7 +8850,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -486,7 +486,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -8840,7 +8841,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8875,7 +8876,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -495,7 +495,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -8848,7 +8849,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8883,7 +8884,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -504,7 +504,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -8858,7 +8859,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8893,7 +8894,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -513,7 +513,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -8866,7 +8867,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8901,7 +8902,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -522,7 +522,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -8878,7 +8879,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8913,7 +8914,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -531,7 +531,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -8886,7 +8887,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8921,7 +8922,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -540,7 +540,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -8896,7 +8897,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8931,7 +8932,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -549,7 +549,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -8938,7 +8939,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -558,7 +558,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -8956,7 +8957,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8991,7 +8992,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -567,7 +567,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9008,7 +9009,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -576,7 +576,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -8981,7 +8982,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9016,7 +9017,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -585,7 +585,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -9006,7 +9007,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9041,7 +9042,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -594,7 +594,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -9014,7 +9015,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9049,7 +9050,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -603,7 +603,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -9039,7 +9040,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9074,7 +9075,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -612,7 +612,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -9063,7 +9064,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9098,7 +9099,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -621,7 +621,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -9136,7 +9137,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9171,7 +9172,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -630,7 +630,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -9212,7 +9213,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9247,7 +9248,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -639,7 +639,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -9228,7 +9229,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9263,7 +9264,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -648,7 +648,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -9241,7 +9242,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9276,7 +9277,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -657,7 +657,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -9254,7 +9255,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9289,7 +9290,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -666,7 +666,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -9270,7 +9271,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9305,7 +9306,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -675,7 +675,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -9281,7 +9282,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9316,7 +9317,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -684,7 +684,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -9331,7 +9332,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9366,7 +9367,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -693,7 +693,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -9339,7 +9340,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9374,7 +9375,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -702,7 +702,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -9347,7 +9348,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9382,7 +9383,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -711,7 +711,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -9356,7 +9357,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9391,7 +9392,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -720,7 +720,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -9364,7 +9365,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9399,7 +9400,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -729,7 +729,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -9373,7 +9374,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9408,7 +9409,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -738,7 +738,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -9381,7 +9382,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9416,7 +9417,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -747,7 +747,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -9409,7 +9410,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9444,7 +9445,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -756,7 +756,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -9425,7 +9426,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9460,7 +9461,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -765,7 +765,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -9445,7 +9446,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9480,7 +9481,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -774,7 +774,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -9453,7 +9454,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9488,7 +9489,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -783,7 +783,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -9461,7 +9462,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9496,7 +9497,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -792,7 +792,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -9477,7 +9478,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9512,7 +9513,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -801,7 +801,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -9553,7 +9554,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9588,7 +9589,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" @@ -810,7 +810,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9600,7 +9601,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" @@ -819,7 +819,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -9593,7 +9594,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9628,7 +9629,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -828,7 +828,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -9618,7 +9619,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9653,7 +9654,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -837,7 +837,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -9630,7 +9631,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9665,7 +9666,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -846,7 +846,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -9643,7 +9644,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9678,7 +9679,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -855,7 +855,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -9654,7 +9655,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9689,7 +9690,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -864,7 +864,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -9725,7 +9726,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9760,7 +9761,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -873,7 +873,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -9835,7 +9836,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9870,7 +9871,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -882,7 +882,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -9871,7 +9872,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9906,7 +9907,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -891,7 +891,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -9892,7 +9893,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9927,7 +9928,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -900,7 +900,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -9900,7 +9901,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9935,7 +9936,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -909,7 +909,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -9961,7 +9962,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10004,7 +10005,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -918,7 +918,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -10174,7 +10175,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10217,7 +10218,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" @@ -927,7 +927,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10281,7 +10282,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -936,7 +936,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -10360,7 +10361,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10403,7 +10404,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" @@ -945,7 +945,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -10407,7 +10408,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10450,7 +10451,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -954,7 +954,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -10420,7 +10421,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10463,7 +10464,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -963,7 +963,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -10518,7 +10519,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10561,7 +10562,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -972,7 +972,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -10559,7 +10560,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10602,7 +10603,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -981,7 +981,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -10851,7 +10852,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10894,7 +10895,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -990,7 +990,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -10859,7 +10860,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10902,7 +10903,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -999,7 +999,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -11067,7 +11068,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1008,7 +1008,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -11231,7 +11232,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11274,7 +11275,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -1017,7 +1017,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -11255,7 +11256,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11298,7 +11299,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1026,7 +1026,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -11272,7 +11273,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11315,7 +11316,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1035,7 +1035,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -11397,7 +11398,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11440,7 +11441,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1044,7 +1044,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -11413,7 +11414,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11456,7 +11457,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1053,7 +1053,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -11526,7 +11527,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11569,7 +11570,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1062,7 +1062,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -11548,7 +11549,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11591,7 +11592,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 500" Attribute "NickName" "" "HP Officejet Series 500, $Version" Attribute "ShortNickName" "" "HP Officejet Series 500" @@ -1071,7 +1071,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -11588,7 +11589,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11631,7 +11632,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1080,7 +1080,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -11640,7 +11641,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11683,7 +11684,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1089,7 +1089,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -11792,7 +11793,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11835,7 +11836,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1098,7 +1098,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -11816,7 +11817,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11859,7 +11860,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1107,7 +1107,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -11836,7 +11837,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11879,7 +11880,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1116,7 +1116,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -11896,7 +11897,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11939,7 +11940,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1125,7 +1125,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -12039,7 +12040,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, $Version" Attribute "ShortNickName" "" "HP Officejet T Series" @@ -1134,7 +1134,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -12050,7 +12051,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12093,7 +12094,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1143,7 +1143,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -12074,7 +12075,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12117,7 +12118,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1152,7 +1152,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12125,7 +12126,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1161,7 +1161,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -12098,7 +12099,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1170,7 +1170,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -12106,7 +12107,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12149,7 +12150,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1179,7 +1179,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -12123,7 +12124,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12166,7 +12167,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1188,7 +1188,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -12131,7 +12132,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12174,7 +12175,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1197,7 +1197,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -12163,7 +12164,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12206,7 +12207,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1206,7 +1206,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -12171,7 +12172,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12214,7 +12215,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1215,7 +1215,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -12187,7 +12188,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12230,7 +12231,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1224,7 +1224,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -12196,7 +12197,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12239,7 +12240,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1233,7 +1233,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -12212,7 +12213,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12255,7 +12256,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1242,7 +1242,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -12329,7 +12330,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12372,7 +12373,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1251,7 +1251,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12381,7 +12382,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1260,7 +1260,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12492,7 +12493,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1269,7 +1269,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12511,7 +12512,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1278,7 +1278,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -12479,7 +12480,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12522,7 +12523,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1287,7 +1287,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -12593,7 +12594,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12636,7 +12637,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1296,7 +1296,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -12602,7 +12603,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12645,7 +12646,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1305,7 +1305,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12787,7 +12788,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" @@ -1314,7 +1314,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -12753,7 +12754,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12796,7 +12797,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" @@ -1323,7 +1323,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -13095,7 +13096,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13270,7 +13271,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1332,7 +1332,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -13105,7 +13106,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13280,7 +13281,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1341,7 +1341,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13574,7 +13575,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" @@ -1350,7 +1350,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -13407,7 +13408,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13582,7 +13583,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" diff --git a/hplip-no-system-tray.patch b/hplip-no-system-tray.patch index a3ae50f..9a1db6c 100644 --- a/hplip-no-system-tray.patch +++ b/hplip-no-system-tray.patch @@ -1,20 +1,20 @@ -diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py ---- hplip-3.10.2/ui4/systemtray.py.no-system-tray 2010-05-11 14:40:57.000000000 +0200 -+++ hplip-3.10.2/ui4/systemtray.py 2010-05-11 15:25:20.000000000 +0200 +diff -up hplip-3.10.5/ui4/systemtray.py.no-system-tray hplip-3.10.5/ui4/systemtray.py +--- hplip-3.10.5/ui4/systemtray.py.no-system-tray 2010-05-13 01:45:04.000000000 +0200 ++++ hplip-3.10.5/ui4/systemtray.py 2010-05-17 15:03:12.000000000 +0200 @@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000 BLIP_DELAY = 2000 SET_MENU_DELAY = 1000 MAX_MENU_EVENTS = 10 -+TRAY_AVAILABLE_DELAY = 30 ++TRAY_AVAILABLE_TIMEOUT = 180 ERROR_STATE_TO_ICON = { ERROR_STATE_CLEAR: QSystemTrayIcon.Information, -@@ -707,7 +708,7 @@ def run(read_pipe): +@@ -706,7 +707,7 @@ def run(read_pipe): app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app i = 0 - while i < 10: -+ while i < TRAY_AVAILABLE_DELAY: ++ while i < TRAY_AVAILABLE_TIMEOUT: if QSystemTrayIcon.isSystemTrayAvailable(): break time.sleep(1.0) diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index 5091e19..e6ba5c6 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff ---- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-24 23:07:09.000000000 +0000 -+++ hplip-3.10.2/fax/filters/pstotiff 2010-03-01 09:52:50.676611385 +0000 -@@ -1,43 +1,16 @@ +diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/filters/pstotiff +--- hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish 2010-05-13 01:44:57.000000000 +0200 ++++ hplip-3.10.5/fax/filters/pstotiff 2010-05-17 14:39:55.000000000 +0200 +@@ -1,40 +1,16 @@ -#!/usr/bin/env python - -import os @@ -21,14 +21,11 @@ diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/ -temp_out_handle, temp_out_fname = tempfile.mkstemp() - -font = "-I/usr/share/cups/fonts" --device = "-sDEVICE=tiffg4 -dDEBUG -dNOPAUSE -dBATCH -dSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +-device = "-sDEVICE=tiffg4 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file - -gs_command = "/usr/bin/gs" + " " + font + " " + device - -exit_code = os.system(gs_command) --#if exit_code != 0: --# print("Ghostscript returned error (error code %d)!" % exit_code) --# sys.exit(exit_code) - -file_len = os.stat(temp_out_fname).st_size -if (file_len < READ_SIZE): diff --git a/hplip-tray-icon-crash.patch b/hplip-tray-icon-crash.patch deleted file mode 100644 index a603cd3..0000000 --- a/hplip-tray-icon-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up hplip-3.10.2/ui4/systemtray.py.tray-icon-crash hplip-3.10.2/ui4/systemtray.py ---- hplip-3.10.2/ui4/systemtray.py.tray-icon-crash 2010-02-24 23:07:15.000000000 +0000 -+++ hplip-3.10.2/ui4/systemtray.py 2010-03-23 16:42:24.476504861 +0000 -@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication): - log.debug("Exiting") - self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT) - self.quit() -+ del self.tray_icon - - - def toolboxTriggered(self): diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 49cb808..c4037f2 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,15 +1,18 @@ -diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules ---- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000 -+++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000 -@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul +diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules +--- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200 ++++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200 +@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + LABEL="pid_test" ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" # Check for LaserJet products (0x03f0xx17). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" -+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" - + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" -ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" +ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" -LABEL="hpmud_rules_end" diff --git a/hplip.spec b/hplip.spec index ba614da..0fad0d7 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.10.2 -Release: 16%{?dist} +Version: 3.10.5 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -22,7 +22,6 @@ Patch5: hplip-deviceIDs-drv.patch Patch6: hplip-mucks-with-spooldir.patch Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch -Patch9: hplip-tray-icon-crash.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch @@ -138,10 +137,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. +# HP LaserJet P1007 (bug #585272). # HP Color LaserJet CM1312nfi (bug #581005). # HP Color LaserJet 3800 (bug #581935). # HP Color LaserJet 2840 (bug #582215). -# HP LaserJet P1007 (bug #585272). %patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files @@ -155,9 +154,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open -# Explicitly destroy tray icon on exit (bug #543286). -%patch9 -p1 -b .tray-icon-crash - # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method @@ -178,10 +174,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP LaserJet 1320 series (bug #579920) # HP LaserJet 2300 (bug #576928) # HP LaserJet P2015 Series (bug #580231) -# HP Color LaserJet 3800 (bug #581935). -# HP Color LaserJet 2840 (bug #582215). # HP LaserJet 4250 (bug #585499). # HP Color LaserJet 2605dn (bug #583953). +# HP Color LaserJet 3800 (bug #581935). +# HP Color LaserJet 2840 (bug #582215). for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz @@ -198,7 +194,7 @@ done # Added missing newline to string argument in dbglog() call (bug #585275). %patch19 -p1 -b .dbglog-newline -# Wait for max 30s to see if a system tray becomes available (bug #569969). +# Wait longer to see if a system tray becomes available (bug #569969). %patch20 -p1 -b .no-system-tray # Prevent segfault in cupsext when opening PPD file (bug #572775). @@ -425,6 +421,10 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon May 17 2010 Jiri Popelka - 3.10.5-1 +- 3.10.5. No longer need tray-icon-crash.patch +- Increase the timeout for system tray availability checking (bug #569969). + * Wed May 12 2010 Jiri Popelka - 3.10.2-16 - Prevent segfault in cupsext when opening PPD file (bug #572775). diff --git a/sources b/sources index c39277f..c173d16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz +a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz From d456d228d273e20774d14669f5cd53f5f6327dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Mon, 17 May 2010 14:23:07 +0000 Subject: [PATCH 53/69] - 3.10.5. No longer need tray-icon-crash.patch - Increase the timeout for system tray availability checking (bug #569969). --- .cvsignore | 1 + hplip-3.10.2.tar.gz.asc | 7 ------- hplip-3.10.5.tar.gz.asc | 7 +++++++ hplip-bad-low-ink-warning.patch | 14 +++++++------- hplip-dbglog-newline.patch | 28 ++++++++++++++-------------- hplip-no-system-tray.patch | 12 ++++++------ hplip-pstotiff-is-rubbish.patch | 20 +++++++++++--------- hplip-tray-icon-crash.patch | 11 ----------- hplip.spec | 14 +++++++------- sources | 2 +- 10 files changed, 54 insertions(+), 62 deletions(-) delete mode 100644 hplip-3.10.2.tar.gz.asc create mode 100644 hplip-3.10.5.tar.gz.asc delete mode 100644 hplip-tray-icon-crash.patch diff --git a/.cvsignore b/.cvsignore index 0b53a69..43b7aff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -32,3 +32,4 @@ hplip-3.9.6b.tar.gz hplip-3.9.8.tar.gz hplip-3.10.2.tar.gz hpcups-update-ppds.sh +hplip-3.10.5.tar.gz diff --git a/hplip-3.10.2.tar.gz.asc b/hplip-3.10.2.tar.gz.asc deleted file mode 100644 index a227003..0000000 --- a/hplip-3.10.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkuFslQACgkQc9dwzaWQR7mpowCgr3YlpISS+6eqBhwkTIdOhc3b -470An0hYImtLZznLX6oljo/gw4zCoqvh -=dMK4 ------END PGP SIGNATURE----- diff --git a/hplip-3.10.5.tar.gz.asc b/hplip-3.10.5.tar.gz.asc new file mode 100644 index 0000000..662f63e --- /dev/null +++ b/hplip-3.10.5.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ +wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U +=H4Nc +-----END PGP SIGNATURE----- diff --git a/hplip-bad-low-ink-warning.patch b/hplip-bad-low-ink-warning.patch index 94af090..bd51d64 100644 --- a/hplip-bad-low-ink-warning.patch +++ b/hplip-bad-low-ink-warning.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp ---- hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2009-08-04 22:43:01.000000000 +0100 -+++ hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp 2009-11-26 14:34:09.944179766 +0000 -@@ -2222,7 +2222,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +diff -up hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp +--- hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2010-05-13 01:48:58.000000000 +0200 ++++ hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp 2010-05-17 14:56:31.000000000 +0200 +@@ -2239,7 +2239,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() { case '5': { @@ -10,7 +10,7 @@ diff -up hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.8/prn { if (err != NO_ERROR) { -@@ -2237,7 +2237,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +@@ -2254,7 +2254,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() } case '6': { @@ -19,7 +19,7 @@ diff -up hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.8/prn { if (err != NO_ERROR) { -@@ -2252,7 +2252,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +@@ -2269,7 +2269,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() } case '7': { @@ -28,7 +28,7 @@ diff -up hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.8/prn { if (err != NO_ERROR) { -@@ -2268,7 +2268,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() +@@ -2285,7 +2285,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() } case '8': { diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch index 6f68837..00b4623 100644 --- a/hplip-dbglog-newline.patch +++ b/hplip-dbglog-newline.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-04-27 12:20:42.000000000 +0200 -+++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-27 12:38:09.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-05-17 15:00:02.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu (attr->value != NULL)) { strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); @@ -36,7 +36,7 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/p } m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; -@@ -495,7 +495,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -503,7 +503,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -45,7 +45,7 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/p closeFilter(); cupsRasterClose(cups_raster); return 1; -@@ -505,7 +505,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -513,7 +513,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -54,9 +54,9 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/p closeFilter(); cupsRasterClose(cups_raster); return 0; -diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Lidil.cpp ---- hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Lidil.cpp 2010-04-27 12:38:08.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Lidil.cpp +--- hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/Lidil.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * if (m_pPM->BaseResX != m_pQA->horizontal_resolution || m_pPM->BaseResY != m_pQA->vertical_resolution) @@ -109,9 +109,9 @@ diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpc return false; } -diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3.cpp ---- hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Pcl3.cpp 2010-04-27 12:38:07.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3.cpp +--- hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/Pcl3.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** if (!selectPrintMode()) @@ -155,9 +155,9 @@ diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcu return false; } -diff -up hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp ---- hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 -+++ hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp 2010-04-27 12:38:06.000000000 +0200 +diff -up hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200 ++++ hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp 2010-05-17 15:00:02.000000000 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline if (!selectPrintMode()) diff --git a/hplip-no-system-tray.patch b/hplip-no-system-tray.patch index a3ae50f..9a1db6c 100644 --- a/hplip-no-system-tray.patch +++ b/hplip-no-system-tray.patch @@ -1,20 +1,20 @@ -diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py ---- hplip-3.10.2/ui4/systemtray.py.no-system-tray 2010-05-11 14:40:57.000000000 +0200 -+++ hplip-3.10.2/ui4/systemtray.py 2010-05-11 15:25:20.000000000 +0200 +diff -up hplip-3.10.5/ui4/systemtray.py.no-system-tray hplip-3.10.5/ui4/systemtray.py +--- hplip-3.10.5/ui4/systemtray.py.no-system-tray 2010-05-13 01:45:04.000000000 +0200 ++++ hplip-3.10.5/ui4/systemtray.py 2010-05-17 15:03:12.000000000 +0200 @@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000 BLIP_DELAY = 2000 SET_MENU_DELAY = 1000 MAX_MENU_EVENTS = 10 -+TRAY_AVAILABLE_DELAY = 30 ++TRAY_AVAILABLE_TIMEOUT = 180 ERROR_STATE_TO_ICON = { ERROR_STATE_CLEAR: QSystemTrayIcon.Information, -@@ -707,7 +708,7 @@ def run(read_pipe): +@@ -706,7 +707,7 @@ def run(read_pipe): app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app i = 0 - while i < 10: -+ while i < TRAY_AVAILABLE_DELAY: ++ while i < TRAY_AVAILABLE_TIMEOUT: if QSystemTrayIcon.isSystemTrayAvailable(): break time.sleep(1.0) diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index 9db74e2..e6ba5c6 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff ---- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-26 12:05:42.883265245 +0000 -+++ hplip-3.10.2/fax/filters/pstotiff 2010-02-26 12:06:06.546266294 +0000 -@@ -1,43 +1,11 @@ +diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/filters/pstotiff +--- hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish 2010-05-13 01:44:57.000000000 +0200 ++++ hplip-3.10.5/fax/filters/pstotiff 2010-05-17 14:39:55.000000000 +0200 +@@ -1,40 +1,16 @@ -#!/usr/bin/env python - -import os @@ -21,14 +21,11 @@ diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/ -temp_out_handle, temp_out_fname = tempfile.mkstemp() - -font = "-I/usr/share/cups/fonts" --device = "-sDEVICE=tiffg4 -dDEBUG -dNOPAUSE -dBATCH -dSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +-device = "-sDEVICE=tiffg4 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file - -gs_command = "/usr/bin/gs" + " " + font + " " + device - -exit_code = os.system(gs_command) --#if exit_code != 0: --# print("Ghostscript returned error (error code %d)!" % exit_code) --# sys.exit(exit_code) - -file_len = os.stat(temp_out_fname).st_size -if (file_len < READ_SIZE): @@ -52,7 +49,12 @@ diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/ + IN="$6" +fi + ++TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1 +gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \ + -dSAFER -dPARANOIDSAFER \ + -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ -+ -sstdout=%stderr -sOutputFile=- "$IN" ++ -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN" ++RET=$? ++cat "$TMPFILE" ++rm -f "$TMPFILE" ++exit $RET diff --git a/hplip-tray-icon-crash.patch b/hplip-tray-icon-crash.patch deleted file mode 100644 index a603cd3..0000000 --- a/hplip-tray-icon-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up hplip-3.10.2/ui4/systemtray.py.tray-icon-crash hplip-3.10.2/ui4/systemtray.py ---- hplip-3.10.2/ui4/systemtray.py.tray-icon-crash 2010-02-24 23:07:15.000000000 +0000 -+++ hplip-3.10.2/ui4/systemtray.py 2010-03-23 16:42:24.476504861 +0000 -@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication): - log.debug("Exiting") - self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT) - self.quit() -+ del self.tray_icon - - - def toolboxTriggered(self): diff --git a/hplip.spec b/hplip.spec index e81bdf5..2154817 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.10.2 -Release: 10%{?dist} +Version: 3.10.5 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -20,7 +20,6 @@ Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch -Patch7: hplip-tray-icon-crash.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -142,9 +141,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # directly (bug #552572). %patch6 -p1 -b .mucks-with-spooldir -# Explicitly destroy tray icon on exit (bug #543286). -%patch7 -p1 -b .tray-icon-crash - # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -169,7 +165,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Added missing newline to string argument in dbglog() call (bug #585275). %patch18 -p1 -b .dbglog-newline -# Wait for max 30s to see if a system tray becomes available (bug #569969). +# Wait longer to see if a system tray becomes available (bug #569969). %patch19 -p1 -b .no-system-tray # Prevent segfault in cupsext when opening PPD file (bug #572775). @@ -395,6 +391,10 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon May 17 2010 Jiri Popelka - 3.10.5-1 +- 3.10.5. No longer need tray-icon-crash.patch +- Increase the timeout for system tray availability checking (bug #569969). + * Wed May 12 2010 Jiri Popelka - 3.10.2-10 - Prevent segfault in cupsext when opening PPD file (bug #572775). diff --git a/sources b/sources index c39277f..c173d16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz +a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz From c7711b78fea32c23775730f47f46db73e47ac96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Mon, 17 May 2010 14:34:14 +0000 Subject: [PATCH 54/69] fix pstotiff-is-rubbish.patch --- hplip-pstotiff-is-rubbish.patch | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index e6ba5c6..7dbf5a0 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,7 +1,7 @@ diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/filters/pstotiff --- hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish 2010-05-13 01:44:57.000000000 +0200 +++ hplip-3.10.5/fax/filters/pstotiff 2010-05-17 14:39:55.000000000 +0200 -@@ -1,40 +1,16 @@ +@@ -1,40 +1,11 @@ -#!/usr/bin/env python - -import os @@ -49,12 +49,7 @@ diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/ + IN="$6" +fi + -+TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1 +gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \ + -dSAFER -dPARANOIDSAFER \ + -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ -+ -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN" -+RET=$? -+cat "$TMPFILE" -+rm -f "$TMPFILE" -+exit $RET ++ -sstdout=%stderr -sOutputFile=- "$IN" From 33463ba9afa2a4f0b8eb50d9daa7960cb6c3b28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Thu, 3 Jun 2010 15:21:51 +0000 Subject: [PATCH 55/69] - Fix ImageableArea for Laserjet 8150/9000 (#596298) --- hplip-ppd-ImageableArea.patch | 459 ++++++++++++++++++++++++++++++++++ hplip.spec | 18 +- 2 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 hplip-ppd-ImageableArea.patch diff --git a/hplip-ppd-ImageableArea.patch b/hplip-ppd-ImageableArea.patch new file mode 100644 index 0000000..213962f --- /dev/null +++ b/hplip-ppd-ImageableArea.patch @@ -0,0 +1,459 @@ +diff -up hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd +--- hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea 2010-05-13 01:48:11.000000000 +0200 ++++ hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd 2010-06-03 17:01:33.000000000 +0200 +@@ -4977,7 +4977,7 @@ restore + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "4.00 3.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -5009,7 +5009,7 @@ restore + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "3.00 3.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -5025,7 +5025,7 @@ restore + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "64.00 54.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -5041,7 +5041,7 @@ restore + *zh_CN.ImageableArea Legal/Legal: "" + *zh_TW.ImageableArea Legal/Legal: "" + +-*ImageableArea LegalSmall/Legal (Small): "3.00 3.00 548.00 954.00" ++*ImageableArea LegalSmall/Legal (Small): "64.00 54.00 548.00 954.00" + *da.ImageableArea LegalSmall/Legal (lille): "" + *de.ImageableArea LegalSmall/Legal (Klein): "" + *es.ImageableArea LegalSmall/Legal (pequeño): "" +@@ -5057,7 +5057,7 @@ restore + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "3.00 3.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -5073,7 +5073,7 @@ restore + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "3.00 3.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -5089,7 +5089,7 @@ restore + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "3.00 3.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -5105,7 +5105,7 @@ restore + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "4.00 3.00 586.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -5137,7 +5137,7 @@ restore + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "3.00 3.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -5153,7 +5153,7 @@ restore + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "3.00 3.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -5169,7 +5169,7 @@ restore + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "3.00 3.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -5185,7 +5185,7 @@ restore + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "3.00 3.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -5201,7 +5201,7 @@ restore + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "3.00 3.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -5217,7 +5217,7 @@ restore + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "3.00 3.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -5233,7 +5233,7 @@ restore + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "3.00 3.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -5249,7 +5249,7 @@ restore + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "3.00 3.00 291.00 678.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" +@@ -5265,7 +5265,7 @@ restore + *zh_CN.ImageableArea Env10/Comm10号信封: "" + *zh_TW.ImageableArea Env10/Comm10 信封: "" + +-*ImageableArea EnvMonarch/Env Monarch: "3.00 3.00 273.00 534.00" ++*ImageableArea EnvMonarch/Env Monarch: "12.00 12.00 266.64 527.76" + *da.ImageableArea EnvMonarch/Konvolut Monarch: "" + *de.ImageableArea EnvMonarch/Umschlag Monarch: "" + *es.ImageableArea EnvMonarch/Sobre Monarch: "" +@@ -5281,7 +5281,7 @@ restore + *zh_CN.ImageableArea EnvMonarch/Monarch号信封: "" + *zh_TW.ImageableArea EnvMonarch/Monarch 信封: "" + +-*ImageableArea EnvDL/Env DL: "3.00 3.00 306.00 618.00" ++*ImageableArea EnvDL/Env DL: "12.00 12.00 299.52 611.28" + *da.ImageableArea EnvDL/Konvolut DL: "" + *de.ImageableArea EnvDL/Umschlag DL: "" + *es.ImageableArea EnvDL/Sobre DL: "" +@@ -5297,7 +5297,7 @@ restore + *zh_CN.ImageableArea EnvDL/DL号信封: "" + *zh_TW.ImageableArea EnvDL/DL 信封: "" + +-*ImageableArea EnvC5/Env C5: "3.00 3.00 453.00 643.00" ++*ImageableArea EnvC5/Env C5: "12.00 12.00 446.88 636.72" + *da.ImageableArea EnvC5/Konvolut C5: "" + *de.ImageableArea EnvC5/Umschlag C5: "" + *es.ImageableArea EnvC5/Sobre C5: "" +@@ -5313,7 +5313,7 @@ restore + *zh_CN.ImageableArea EnvC5/C5号信封: "" + *zh_TW.ImageableArea EnvC5/C5 信封: "" + +-*ImageableArea EnvISOB5/Env ISO B5: "3.00 3.00 493.00 703.00" ++*ImageableArea EnvISOB5/Env ISO B5: "12.00 12.00 486.48 696.24" + *da.ImageableArea EnvISOB5/Konvolut ISO B5: "" + *de.ImageableArea EnvISOB5/Umschlag ISO B5: "" + *es.ImageableArea EnvISOB5/Sobre ISO B5: "" +diff -up hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd +--- hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea 2010-05-13 01:48:11.000000000 +0200 ++++ hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd 2010-06-03 17:01:32.000000000 +0200 +@@ -4344,7 +4344,7 @@ currentpagedevice /MediaProcessing known + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "6.00 6.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -4376,7 +4376,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "6.00 6.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -4392,7 +4392,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "6.00 6.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -4424,7 +4424,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "6.00 6.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -4440,7 +4440,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "6.00 6.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -4456,7 +4456,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "6.00 6.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -4472,7 +4472,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "6.00 6.00 589.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -4504,7 +4504,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "6.00 6.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -4520,7 +4520,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "6.00 6.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -4536,7 +4536,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "6.00 6.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -4552,7 +4552,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "6.00 6.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -4568,7 +4568,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "6.00 6.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -4584,7 +4584,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "6.00 6.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -4600,7 +4600,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "6.00 6.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -4616,7 +4616,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "11.00 11.00 286.00 673.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" +diff -up hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd +--- hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea 2010-05-13 01:48:11.000000000 +0200 ++++ hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd 2010-06-03 17:01:35.000000000 +0200 +@@ -5140,7 +5140,7 @@ currentpagedevice /MediaProcessing known + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "6.00 6.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -5172,7 +5172,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "6.00 6.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -5188,7 +5188,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "6.00 6.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -5220,7 +5220,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "6.00 6.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -5236,7 +5236,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "6.00 6.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -5252,7 +5252,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "6.00 6.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -5268,7 +5268,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "6.00 6.00 589.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -5300,7 +5300,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "6.00 6.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -5316,7 +5316,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "6.00 6.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -5332,7 +5332,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "6.00 6.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -5348,7 +5348,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "6.00 6.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -5364,7 +5364,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "6.00 6.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -5380,7 +5380,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "6.00 6.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -5396,7 +5396,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "6.00 6.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -5412,7 +5412,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "11.00 11.00 286.00 673.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" diff --git a/hplip.spec b/hplip.spec index 0fad0d7..64befef 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -32,6 +32,7 @@ Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch Patch20: hplip-no-system-tray.patch Patch21: hplip-openPPD.patch +Patch22: hplip-ppd-ImageableArea.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -200,6 +201,18 @@ done # Prevent segfault in cupsext when opening PPD file (bug #572775). %patch21 -p1 -b .openPPD +# Fix ImageableArea for Laserjet 8150/9000 (bug #596298). +for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch22 -p1 -b .deviceIDs-ppd +for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done + + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -421,6 +434,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Jun 03 2010 Jiri Popelka - 3.10.5-2 +- Fix ImageableArea for Laserjet 8150/9000 (#596298) + * Mon May 17 2010 Jiri Popelka - 3.10.5-1 - 3.10.5. No longer need tray-icon-crash.patch - Increase the timeout for system tray availability checking (bug #569969). From 2b26067e500cb9449dd447b3547a2b14e9de09ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Thu, 3 Jun 2010 15:22:03 +0000 Subject: [PATCH 56/69] - Fix ImageableArea for Laserjet 8150/9000 (#596298) --- hplip-ppd-ImageableArea.patch | 459 ++++++++++++++++++++++++++++++++++ hplip.spec | 17 +- 2 files changed, 475 insertions(+), 1 deletion(-) create mode 100644 hplip-ppd-ImageableArea.patch diff --git a/hplip-ppd-ImageableArea.patch b/hplip-ppd-ImageableArea.patch new file mode 100644 index 0000000..213962f --- /dev/null +++ b/hplip-ppd-ImageableArea.patch @@ -0,0 +1,459 @@ +diff -up hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd +--- hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea 2010-05-13 01:48:11.000000000 +0200 ++++ hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd 2010-06-03 17:01:33.000000000 +0200 +@@ -4977,7 +4977,7 @@ restore + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "4.00 3.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -5009,7 +5009,7 @@ restore + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "3.00 3.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -5025,7 +5025,7 @@ restore + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "64.00 54.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -5041,7 +5041,7 @@ restore + *zh_CN.ImageableArea Legal/Legal: "" + *zh_TW.ImageableArea Legal/Legal: "" + +-*ImageableArea LegalSmall/Legal (Small): "3.00 3.00 548.00 954.00" ++*ImageableArea LegalSmall/Legal (Small): "64.00 54.00 548.00 954.00" + *da.ImageableArea LegalSmall/Legal (lille): "" + *de.ImageableArea LegalSmall/Legal (Klein): "" + *es.ImageableArea LegalSmall/Legal (pequeño): "" +@@ -5057,7 +5057,7 @@ restore + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "3.00 3.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -5073,7 +5073,7 @@ restore + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "3.00 3.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -5089,7 +5089,7 @@ restore + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "3.00 3.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -5105,7 +5105,7 @@ restore + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "4.00 3.00 586.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -5137,7 +5137,7 @@ restore + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "3.00 3.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -5153,7 +5153,7 @@ restore + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "3.00 3.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -5169,7 +5169,7 @@ restore + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "3.00 3.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -5185,7 +5185,7 @@ restore + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "3.00 3.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -5201,7 +5201,7 @@ restore + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "3.00 3.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -5217,7 +5217,7 @@ restore + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "3.00 3.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -5233,7 +5233,7 @@ restore + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "3.00 3.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -5249,7 +5249,7 @@ restore + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "3.00 3.00 291.00 678.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" +@@ -5265,7 +5265,7 @@ restore + *zh_CN.ImageableArea Env10/Comm10号信封: "" + *zh_TW.ImageableArea Env10/Comm10 信封: "" + +-*ImageableArea EnvMonarch/Env Monarch: "3.00 3.00 273.00 534.00" ++*ImageableArea EnvMonarch/Env Monarch: "12.00 12.00 266.64 527.76" + *da.ImageableArea EnvMonarch/Konvolut Monarch: "" + *de.ImageableArea EnvMonarch/Umschlag Monarch: "" + *es.ImageableArea EnvMonarch/Sobre Monarch: "" +@@ -5281,7 +5281,7 @@ restore + *zh_CN.ImageableArea EnvMonarch/Monarch号信封: "" + *zh_TW.ImageableArea EnvMonarch/Monarch 信封: "" + +-*ImageableArea EnvDL/Env DL: "3.00 3.00 306.00 618.00" ++*ImageableArea EnvDL/Env DL: "12.00 12.00 299.52 611.28" + *da.ImageableArea EnvDL/Konvolut DL: "" + *de.ImageableArea EnvDL/Umschlag DL: "" + *es.ImageableArea EnvDL/Sobre DL: "" +@@ -5297,7 +5297,7 @@ restore + *zh_CN.ImageableArea EnvDL/DL号信封: "" + *zh_TW.ImageableArea EnvDL/DL 信封: "" + +-*ImageableArea EnvC5/Env C5: "3.00 3.00 453.00 643.00" ++*ImageableArea EnvC5/Env C5: "12.00 12.00 446.88 636.72" + *da.ImageableArea EnvC5/Konvolut C5: "" + *de.ImageableArea EnvC5/Umschlag C5: "" + *es.ImageableArea EnvC5/Sobre C5: "" +@@ -5313,7 +5313,7 @@ restore + *zh_CN.ImageableArea EnvC5/C5号信封: "" + *zh_TW.ImageableArea EnvC5/C5 信封: "" + +-*ImageableArea EnvISOB5/Env ISO B5: "3.00 3.00 493.00 703.00" ++*ImageableArea EnvISOB5/Env ISO B5: "12.00 12.00 486.48 696.24" + *da.ImageableArea EnvISOB5/Konvolut ISO B5: "" + *de.ImageableArea EnvISOB5/Umschlag ISO B5: "" + *es.ImageableArea EnvISOB5/Sobre ISO B5: "" +diff -up hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd +--- hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea 2010-05-13 01:48:11.000000000 +0200 ++++ hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd 2010-06-03 17:01:32.000000000 +0200 +@@ -4344,7 +4344,7 @@ currentpagedevice /MediaProcessing known + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "6.00 6.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -4376,7 +4376,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "6.00 6.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -4392,7 +4392,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "6.00 6.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -4424,7 +4424,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "6.00 6.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -4440,7 +4440,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "6.00 6.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -4456,7 +4456,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "6.00 6.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -4472,7 +4472,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "6.00 6.00 589.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -4504,7 +4504,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "6.00 6.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -4520,7 +4520,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "6.00 6.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -4536,7 +4536,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "6.00 6.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -4552,7 +4552,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "6.00 6.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -4568,7 +4568,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "6.00 6.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -4584,7 +4584,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "6.00 6.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -4600,7 +4600,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "6.00 6.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -4616,7 +4616,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "11.00 11.00 286.00 673.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" +diff -up hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd +--- hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea 2010-05-13 01:48:11.000000000 +0200 ++++ hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd 2010-06-03 17:01:35.000000000 +0200 +@@ -5140,7 +5140,7 @@ currentpagedevice /MediaProcessing known + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "6.00 6.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -5172,7 +5172,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "6.00 6.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -5188,7 +5188,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "6.00 6.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -5220,7 +5220,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "6.00 6.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -5236,7 +5236,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "6.00 6.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -5252,7 +5252,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "6.00 6.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -5268,7 +5268,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "6.00 6.00 589.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -5300,7 +5300,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "6.00 6.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -5316,7 +5316,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "6.00 6.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -5332,7 +5332,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "6.00 6.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -5348,7 +5348,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "6.00 6.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -5364,7 +5364,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "6.00 6.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -5380,7 +5380,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "6.00 6.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -5396,7 +5396,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "6.00 6.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -5412,7 +5412,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "11.00 11.00 286.00 673.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" diff --git a/hplip.spec b/hplip.spec index 2154817..12896b7 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -30,6 +30,7 @@ Patch17: hplip-skip-blank-lines.patch Patch18: hplip-dbglog-newline.patch Patch19: hplip-no-system-tray.patch Patch20: hplip-openPPD.patch +Patch21: hplip-ppd-ImageableArea.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -171,6 +172,17 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Prevent segfault in cupsext when opening PPD file (bug #572775). %patch20 -p1 -b .openPPD +# Fix ImageableArea for Laserjet 8150/9000 (bug #596298). +for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch21 -p1 -b .deviceIDs-ppd +for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -391,6 +403,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Jun 03 2010 Jiri Popelka - 3.10.5-2 +- Fix ImageableArea for Laserjet 8150/9000 (#596298) + * Mon May 17 2010 Jiri Popelka - 3.10.5-1 - 3.10.5. No longer need tray-icon-crash.patch - Increase the timeout for system tray availability checking (bug #569969). From 1d6ffcf1d794090cc981c2c5a9e62025bcd45704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Mon, 7 Jun 2010 16:10:27 +0000 Subject: [PATCH 57/69] - hplip-gui requires libsane-hpaio --- hplip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index 12896b7..966994e 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -88,6 +88,7 @@ Requires: python-reportlab Requires(post): desktop-file-utils >= 0.2.92 Requires(postun): desktop-file-utils >= 0.2.92 Requires: %{name} = %{version}-%{release} +Requires: libsane-hpaio = %{version}-%{release} %description gui HPLIP graphical tools. @@ -403,6 +404,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon Jun 07 2010 Jiri Popelka - 3.10.5-3 +- hplip-gui requires libsane-hpaio + * Thu Jun 03 2010 Jiri Popelka - 3.10.5-2 - Fix ImageableArea for Laserjet 8150/9000 (#596298) From 70daa3a5e4d98f8e3e72eb4596f045220ada5390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Mon, 7 Jun 2010 16:10:35 +0000 Subject: [PATCH 58/69] - hplip-gui requires libsane-hpaio --- hplip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index 64befef..17c51b6 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -90,6 +90,7 @@ Requires: python-reportlab Requires(post): desktop-file-utils >= 0.2.92 Requires(postun): desktop-file-utils >= 0.2.92 Requires: %{name} = %{version}-%{release} +Requires: libsane-hpaio = %{version}-%{release} %description gui HPLIP graphical tools. @@ -434,6 +435,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon Jun 07 2010 Jiri Popelka - 3.10.5-3 +- hplip-gui requires libsane-hpaio + * Thu Jun 03 2010 Jiri Popelka - 3.10.5-2 - Fix ImageableArea for Laserjet 8150/9000 (#596298) From 3976f4248e41b3950f42586a83dc6008578ecf0d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 9 Jun 2010 15:49:58 +0000 Subject: [PATCH 59/69] - Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). --- hplip-snmp-quirks.patch | 12 ++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 hplip-snmp-quirks.patch diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch new file mode 100644 index 0000000..5b80afa --- /dev/null +++ b/hplip-snmp-quirks.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.10.5/prnt/drv/hpcups.drv.in +--- hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks 2010-06-09 16:14:58.240019141 +0100 ++++ hplip-3.10.5/prnt/drv/hpcups.drv.in 2010-06-09 16:15:06.492145617 +0100 +@@ -5261,6 +5261,8 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Officejet Pro 8500 a909g, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;" ++ // This device lies about its supplies capacity. ++ Attribute "cupsSNMPQuirks" "" "capacity" + PCFileName "hp-officejet_pro_8500_a909g.ppd" + Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)" + } diff --git a/hplip.spec b/hplip.spec index 17c51b6..8999f09 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -22,6 +22,7 @@ Patch5: hplip-deviceIDs-drv.patch Patch6: hplip-mucks-with-spooldir.patch Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch +Patch9: hplip-snmp-quirks.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch @@ -156,6 +157,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open +# Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). +%patch9 -p1 -b .snmp-quirks + # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method @@ -435,6 +439,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed Jun 9 2010 Tim Waugh - 3.10.5-4 +- Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). + * Mon Jun 07 2010 Jiri Popelka - 3.10.5-3 - hplip-gui requires libsane-hpaio From a0dbbb0e7156b84560675cd9a4d9ebf507ee20c6 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 9 Jun 2010 15:50:36 +0000 Subject: [PATCH 60/69] - Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). --- hplip-snmp-quirks.patch | 12 ++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 hplip-snmp-quirks.patch diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch new file mode 100644 index 0000000..5b80afa --- /dev/null +++ b/hplip-snmp-quirks.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.10.5/prnt/drv/hpcups.drv.in +--- hplip-3.10.5/prnt/drv/hpcups.drv.in.snmp-quirks 2010-06-09 16:14:58.240019141 +0100 ++++ hplip-3.10.5/prnt/drv/hpcups.drv.in 2010-06-09 16:15:06.492145617 +0100 +@@ -5261,6 +5261,8 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Officejet Pro 8500 a909g, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;" ++ // This device lies about its supplies capacity. ++ Attribute "cupsSNMPQuirks" "" "capacity" + PCFileName "hp-officejet_pro_8500_a909g.ppd" + Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)" + } diff --git a/hplip.spec b/hplip.spec index 966994e..0f3e101 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -20,6 +20,7 @@ Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch Patch5: hplip-device-ids.patch Patch6: hplip-mucks-with-spooldir.patch +Patch7: hplip-snmp-quirks.patch Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch @@ -143,6 +144,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # directly (bug #552572). %patch6 -p1 -b .mucks-with-spooldir +# Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). +%patch7 -p1 -b .snmp-quirks + # Retry when connecting to device fails (bug #532112). %patch8 -p1 -b .retry-open @@ -404,6 +408,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed Jun 9 2010 Tim Waugh - 3.10.5-4 +- Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). + * Mon Jun 07 2010 Jiri Popelka - 3.10.5-3 - hplip-gui requires libsane-hpaio From 3cf633e1e16df97d764226cac850016233786ec7 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 17 Jun 2010 14:46:57 +0000 Subject: [PATCH 61/69] - Fixed marker-supply attributes in hpijs (bug #605269). --- hplip-bad-state-attr.patch | 17 +++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 hplip-bad-state-attr.patch diff --git a/hplip-bad-state-attr.patch b/hplip-bad-state-attr.patch new file mode 100644 index 0000000..9c74f35 --- /dev/null +++ b/hplip-bad-state-attr.patch @@ -0,0 +1,17 @@ +diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp +--- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr 2010-06-17 15:11:53.417989598 +0100 ++++ hplip-3.10.5/prnt/hpijs/hpijs.cpp 2010-06-17 15:28:41.169989632 +0100 +@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char * + case WARN_LOW_INK_YELLOW: + case WARN_LOW_INK_MULTIPLE_PENS: + { +- BUG ("STATE: +marker-supply-low-warning\n"); ++ fputs("STATE: +marker-supply-low-warning\n", stderr); + break; + } + default: +- BUG ("STATE: -marker-supply-low-warning\n"); ++ fputs("STATE: -marker-supply-low-warning\n", stderr); + } + } + diff --git a/hplip.spec b/hplip.spec index 8999f09..cf57850 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ Patch9: hplip-snmp-quirks.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch +Patch13: hplip-bad-state-attr.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch @@ -169,6 +170,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons +# Fixed marker-supply attributes in hpijs (bug #605269). +%patch13 -p1 -b .bad-state-attr + # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -439,6 +443,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Jun 17 2010 Tim Waugh - 3.10.5-5 +- Fixed marker-supply attributes in hpijs (bug #605269). + * Wed Jun 9 2010 Tim Waugh - 3.10.5-4 - Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). From 3ef4f0a91607fde4dc73eeb2f321d7760a7517ab Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 17 Jun 2010 15:01:45 +0000 Subject: [PATCH 62/69] - Fixed marker-supply attributes in hpijs (bug #605269). --- hplip-bad-state-attr.patch | 17 +++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 hplip-bad-state-attr.patch diff --git a/hplip-bad-state-attr.patch b/hplip-bad-state-attr.patch new file mode 100644 index 0000000..9c74f35 --- /dev/null +++ b/hplip-bad-state-attr.patch @@ -0,0 +1,17 @@ +diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp +--- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr 2010-06-17 15:11:53.417989598 +0100 ++++ hplip-3.10.5/prnt/hpijs/hpijs.cpp 2010-06-17 15:28:41.169989632 +0100 +@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char * + case WARN_LOW_INK_YELLOW: + case WARN_LOW_INK_MULTIPLE_PENS: + { +- BUG ("STATE: +marker-supply-low-warning\n"); ++ fputs("STATE: +marker-supply-low-warning\n", stderr); + break; + } + default: +- BUG ("STATE: -marker-supply-low-warning\n"); ++ fputs("STATE: -marker-supply-low-warning\n", stderr); + } + } + diff --git a/hplip.spec b/hplip.spec index 0f3e101..253d94c 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -25,6 +25,7 @@ Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch +Patch13: hplip-bad-state-attr.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-skip-blank-lines.patch @@ -159,6 +160,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons +# Fixed marker-supply attributes in hpijs (bug #605269). +%patch13 -p1 -b .bad-state-attr + # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -408,6 +412,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Jun 17 2010 Tim Waugh - 3.10.5-5 +- Fixed marker-supply attributes in hpijs (bug #605269). + * Wed Jun 9 2010 Tim Waugh - 3.10.5-4 - Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). From 64e9a6b80ef1240b89969f4d92da4ac9ca943510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Thu, 24 Jun 2010 15:09:45 +0000 Subject: [PATCH 63/69] - Main package requires explicit version of hplip-libs. --- hplip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hplip.spec b/hplip.spec index cf57850..72476bc 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -45,7 +45,7 @@ Requires(preun): /sbin/chkconfig %define hpijs_epoch 1 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release} - +Requires: %{name}-libs = %{version}-%{release} Requires: python-imaging BuildRequires: net-snmp-devel @@ -443,6 +443,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon Jun 24 2010 Jiri Popelka - 3.10.5-6 +- Main package requires explicit version of hplip-libs. + * Thu Jun 17 2010 Tim Waugh - 3.10.5-5 - Fixed marker-supply attributes in hpijs (bug #605269). From 536ccf23450369fa4d12d221eb04d5e50a1b8d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Thu, 24 Jun 2010 15:10:14 +0000 Subject: [PATCH 64/69] - Main package requires explicit version of hplip-libs. --- hplip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hplip.spec b/hplip.spec index 253d94c..3489f97 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -43,7 +43,7 @@ Requires(preun): /sbin/chkconfig %define hpijs_epoch 1 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release} - +Requires: %{name}-libs = %{version}-%{release} Requires: python-imaging Requires: hal @@ -412,6 +412,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon Jun 24 2010 Jiri Popelka - 3.10.5-6 +- Main package requires explicit version of hplip-libs. + * Thu Jun 17 2010 Tim Waugh - 3.10.5-5 - Fixed marker-supply attributes in hpijs (bug #605269). From 29203b003abd96510581d8e3381fa34a15cef195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Mon, 12 Jul 2010 12:29:52 +0000 Subject: [PATCH 65/69] - Added COPYING to common sub-package. --- hplip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index 72476bc..819046c 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -377,6 +377,7 @@ rm -rf %{buildroot} %files common %defattr(-,root,root,-) +%doc COPYING %{_sysconfdir}/udev/rules.d/* %dir %{_sysconfdir}/hp %config(noreplace) %{_sysconfdir}/hp/hplip.conf @@ -443,6 +444,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Mon Jun 24 2010 Jiri Popelka - 3.10.5-7 +- Added COPYING to common sub-package. + * Mon Jun 24 2010 Jiri Popelka - 3.10.5-6 - Main package requires explicit version of hplip-libs. From 48687510358460113f819a0c5b4a7ef7b854e222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Tue, 27 Jul 2010 10:33:48 +0000 Subject: [PATCH 66/69] - 3.10.6. - Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351). - Corrected IEEE 1284 Device IDs: - HP Color LaserJet CP1518ni (bug #613689). - HP Color LaserJet 2600n (bug #613712). --- .cvsignore | 1 + hplip-3.10.5.tar.gz.asc | 7 - hplip-3.10.6.tar.gz.asc | 7 + hplip-bad-state-attr.patch | 17 -- hplip-deviceIDs-drv.patch | 326 +++++++++++++++++++------------------ hplip-env-python.patch | 315 +++++++++++++++++++++++++++++++++++ hplip.spec | 19 ++- sources | 2 +- 8 files changed, 510 insertions(+), 184 deletions(-) delete mode 100644 hplip-3.10.5.tar.gz.asc create mode 100644 hplip-3.10.6.tar.gz.asc delete mode 100644 hplip-bad-state-attr.patch create mode 100644 hplip-env-python.patch diff --git a/.cvsignore b/.cvsignore index 5b20f8c..c849e92 100644 --- a/.cvsignore +++ b/.cvsignore @@ -35,3 +35,4 @@ hplip-3.9.12.tar.gz hplip-3.10.2.tar.gz hpcups-update-ppds.sh hplip-3.10.5.tar.gz +hplip-3.10.6.tar.gz diff --git a/hplip-3.10.5.tar.gz.asc b/hplip-3.10.5.tar.gz.asc deleted file mode 100644 index 662f63e..0000000 --- a/hplip-3.10.5.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ -wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U -=H4Nc ------END PGP SIGNATURE----- diff --git a/hplip-3.10.6.tar.gz.asc b/hplip-3.10.6.tar.gz.asc new file mode 100644 index 0000000..f8f003c --- /dev/null +++ b/hplip-3.10.6.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkxDtwQACgkQc9dwzaWQR7nApgCcC0cVr7w9rEJdir1Gyl71m9rB +PEsAoK+qjoBn/ksBmhTiNQRYdr/XCE19 +=MeCZ +-----END PGP SIGNATURE----- diff --git a/hplip-bad-state-attr.patch b/hplip-bad-state-attr.patch deleted file mode 100644 index 9c74f35..0000000 --- a/hplip-bad-state-attr.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp ---- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr 2010-06-17 15:11:53.417989598 +0100 -+++ hplip-3.10.5/prnt/hpijs/hpijs.cpp 2010-06-17 15:28:41.169989632 +0100 -@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char * - case WARN_LOW_INK_YELLOW: - case WARN_LOW_INK_MULTIPLE_PENS: - { -- BUG ("STATE: +marker-supply-low-warning\n"); -+ fputs("STATE: +marker-supply-low-warning\n", stderr); - break; - } - default: -- BUG ("STATE: -marker-supply-low-warning\n"); -+ fputs("STATE: -marker-supply-low-warning\n", stderr); - } - } - diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 5f7c42c..a90b455 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv/hpcups.drv.in ---- hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-05-13 01:47:57.000000000 +0200 -+++ hplip-3.10.5/prnt/drv/hpcups.drv.in 2010-05-17 14:46:45.000000000 +0200 -@@ -424,7 +424,7 @@ Manufacturer "HP" +diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv/hpcups.drv.in +--- hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-07-19 04:20:01.000000000 +0200 ++++ hplip-3.10.6/prnt/drv/hpcups.drv.in 2010-07-27 11:33:48.000000000 +0200 +@@ -433,7 +433,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -432,7 +432,7 @@ Manufacturer "HP" +@@ -441,7 +441,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -449,7 +449,7 @@ Manufacturer "HP" +@@ -458,7 +458,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -497,7 +497,7 @@ Manufacturer "HP" +@@ -506,7 +506,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -513,7 +513,7 @@ Manufacturer "HP" +@@ -522,7 +522,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -529,7 +529,7 @@ Manufacturer "HP" +@@ -538,7 +538,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -537,7 +537,7 @@ Manufacturer "HP" +@@ -546,7 +546,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -569,7 +569,7 @@ Manufacturer "HP" +@@ -578,7 +578,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -585,7 +585,7 @@ Manufacturer "HP" +@@ -594,7 +594,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -604,7 +604,7 @@ Manufacturer "HP" +@@ -613,7 +613,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -645,7 +645,7 @@ Manufacturer "HP" +@@ -654,7 +654,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -664,7 +664,7 @@ Manufacturer "HP" +@@ -673,7 +673,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -721,7 +721,7 @@ Manufacturer "HP" +@@ -730,7 +730,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" @@ -118,7 +118,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -729,7 +729,7 @@ Manufacturer "HP" +@@ -738,7 +738,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -127,7 +127,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -749,7 +749,7 @@ Manufacturer "HP" +@@ -758,7 +758,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +136,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -758,7 +758,7 @@ Manufacturer "HP" +@@ -767,7 +767,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +145,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -792,7 +792,7 @@ Manufacturer "HP" +@@ -801,7 +801,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +154,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -830,7 +830,7 @@ Manufacturer "HP" +@@ -839,7 +839,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +163,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -838,7 +838,7 @@ Manufacturer "HP" +@@ -847,7 +847,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,7 +172,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -889,7 +889,7 @@ Manufacturer "HP" +@@ -898,7 +898,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -181,7 +181,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1085,7 +1085,7 @@ Manufacturer "HP" +@@ -1094,7 +1094,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -190,7 +190,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1527,7 +1527,7 @@ Manufacturer "HP" +@@ -1536,7 +1536,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -199,7 +199,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1550,7 +1550,7 @@ Manufacturer "HP" +@@ -1559,7 +1559,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +208,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1560,7 +1560,7 @@ Manufacturer "HP" +@@ -1569,7 +1569,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +217,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1569,7 +1569,7 @@ Manufacturer "HP" +@@ -1578,7 +1578,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +226,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1632,7 +1632,7 @@ Manufacturer "HP" +@@ -1641,7 +1641,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,7 +235,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1640,7 +1640,7 @@ Manufacturer "HP" +@@ -1649,7 +1649,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -244,7 +244,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1653,7 +1653,7 @@ Manufacturer "HP" +@@ -1662,7 +1662,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -253,7 +253,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1661,7 +1661,7 @@ Manufacturer "HP" +@@ -1670,7 +1670,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -262,7 +262,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1698,7 +1698,7 @@ Manufacturer "HP" +@@ -1707,7 +1707,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,7 +271,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1928,7 +1928,7 @@ Manufacturer "HP" +@@ -1937,7 +1937,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -280,7 +280,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1938,7 +1938,7 @@ Manufacturer "HP" +@@ -1947,7 +1947,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -289,7 +289,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1946,7 +1946,7 @@ Manufacturer "HP" +@@ -1955,7 +1955,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -298,7 +298,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1955,7 +1955,7 @@ Manufacturer "HP" +@@ -1964,7 +1964,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -307,7 +307,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2476,7 +2476,7 @@ Manufacturer "HP" +@@ -2485,7 +2485,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_1600_series.ppd" Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" -@@ -2492,7 +2492,7 @@ Manufacturer "HP" +@@ -2501,7 +2501,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2510,7 +2510,7 @@ Manufacturer "HP" +@@ -2519,7 +2519,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -334,7 +334,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2519,7 +2519,7 @@ Manufacturer "HP" +@@ -2528,7 +2528,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -343,7 +343,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2536,7 +2536,7 @@ Manufacturer "HP" +@@ -2545,7 +2545,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -352,7 +352,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2562,7 +2562,7 @@ Manufacturer "HP" +@@ -2571,7 +2571,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -361,7 +361,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3023,7 +3023,7 @@ Manufacturer "HP" +@@ -3032,7 +3032,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -370,7 +370,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3096,7 +3096,7 @@ Manufacturer "HP" +@@ -3105,7 +3105,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -379,7 +379,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3151,7 +3151,7 @@ Manufacturer "HP" +@@ -3160,7 +3160,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -388,7 +388,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3320,7 +3320,7 @@ Manufacturer "HP" +@@ -3329,7 +3329,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3405,7 +3405,7 @@ Manufacturer "HP" +@@ -3414,7 +3414,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -7327,7 +7327,7 @@ Manufacturer "HP" +@@ -7579,7 +7579,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -7337,7 +7337,7 @@ Manufacturer "HP" +@@ -7589,7 +7589,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -7520,7 +7520,7 @@ Manufacturer "HP" +@@ -7772,7 +7772,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -433,7 +433,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -7529,7 +7529,7 @@ Manufacturer "HP" +@@ -7781,7 +7781,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -7556,7 +7556,7 @@ Manufacturer "HP" +@@ -7808,7 +7808,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -7854,7 +7854,7 @@ Manufacturer "HP" +@@ -8114,7 +8114,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -7925,7 +7925,7 @@ Manufacturer "HP" +@@ -8185,7 +8185,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -469,7 +469,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -8422,6 +8422,7 @@ Manufacturer "HP" +@@ -8682,6 +8682,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -477,7 +477,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -8849,7 +8850,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9109,7 +9110,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -486,7 +486,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -8875,7 +8876,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9135,7 +9136,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -495,7 +495,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -8883,7 +8884,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9143,7 +9144,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -504,7 +504,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -8893,7 +8894,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9153,7 +9154,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -513,7 +513,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -8901,7 +8902,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9161,7 +9162,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -522,7 +522,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -8913,7 +8914,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9173,7 +9174,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -531,7 +531,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -8921,7 +8922,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9181,7 +9182,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -540,7 +540,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -8931,7 +8932,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9191,7 +9192,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -549,7 +549,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9233,7 +9234,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -558,7 +558,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -8991,7 +8992,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9251,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -567,7 +567,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -9008,7 +9009,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9268,7 +9269,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -576,7 +576,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -9016,7 +9017,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9276,7 +9277,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -585,7 +585,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -9041,7 +9042,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9301,7 +9302,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -594,7 +594,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -9049,7 +9050,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9309,7 +9310,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -603,7 +603,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -9074,7 +9075,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9334,7 +9335,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -612,7 +612,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -9098,7 +9099,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9358,7 +9359,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -621,7 +621,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -9171,7 +9172,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9431,7 +9432,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -630,7 +630,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -9247,7 +9248,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9507,7 +9508,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -639,7 +639,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -9263,7 +9264,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9523,7 +9524,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -648,7 +648,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -9276,7 +9277,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9536,7 +9537,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -657,7 +657,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -9289,7 +9290,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9549,7 +9550,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -666,7 +666,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -9305,7 +9306,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -675,7 +675,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -9316,7 +9317,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9576,7 +9577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -684,7 +684,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -9366,7 +9367,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9626,7 +9627,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -693,7 +693,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -9374,7 +9375,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9634,7 +9635,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -702,7 +702,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -9382,7 +9383,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9642,7 +9643,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -711,7 +711,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -9391,7 +9392,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9651,7 +9652,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -720,7 +720,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -9399,7 +9400,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9659,7 +9660,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -729,7 +729,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -9408,7 +9409,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9668,7 +9669,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -738,7 +738,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -9416,7 +9417,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9676,7 +9677,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -747,7 +747,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -9444,7 +9445,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9704,7 +9705,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -756,7 +756,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -9460,7 +9461,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9720,7 +9721,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -765,7 +765,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -9480,7 +9481,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9740,7 +9741,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -774,7 +774,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -9488,7 +9489,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9748,7 +9749,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -783,7 +783,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -9496,7 +9497,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9756,7 +9757,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -792,7 +792,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -9512,7 +9513,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9772,7 +9773,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -801,7 +801,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -9588,7 +9589,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9848,7 +9849,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" @@ -810,7 +810,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -9600,7 +9601,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9860,7 +9861,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" @@ -819,7 +819,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -9628,7 +9629,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9888,7 +9889,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -828,7 +828,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -9653,7 +9654,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9913,7 +9914,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -837,7 +837,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -9665,7 +9666,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9925,7 +9926,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -846,7 +846,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -9678,7 +9679,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9938,7 +9939,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -855,7 +855,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -9689,7 +9690,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9949,7 +9950,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -864,7 +864,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -9760,7 +9761,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10020,7 +10021,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -873,7 +873,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -9870,7 +9871,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10130,7 +10131,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -882,7 +882,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -9906,7 +9907,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -891,7 +891,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -9927,7 +9928,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10187,7 +10188,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -900,7 +900,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -9935,7 +9936,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10195,7 +10196,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -909,7 +909,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -10004,7 +10005,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10264,7 +10265,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -918,7 +918,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -10217,7 +10218,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10477,7 +10478,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" @@ -927,7 +927,16 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -10281,7 +10282,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10501,7 +10502,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp1518ni" + Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1518ni;DES:Hewlett-Packard Color LaserJet CP1518ni;" + PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" + } +@@ -10541,7 +10542,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -936,7 +945,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -10403,7 +10404,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10663,7 +10664,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" @@ -945,7 +954,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -10450,7 +10451,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10710,7 +10711,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -954,7 +963,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -10463,7 +10464,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10723,7 +10724,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -963,7 +972,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -10561,7 +10562,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10821,7 +10822,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -972,7 +981,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -10602,7 +10603,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10862,7 +10863,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -981,7 +990,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -10894,7 +10895,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11154,7 +11155,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -990,7 +999,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -10902,7 +10903,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11162,7 +11163,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -999,7 +1008,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11370,7 +11371,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1008,7 +1017,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -11274,7 +11275,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11534,7 +11535,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -1017,7 +1026,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -11298,7 +11299,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11558,7 +11559,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1026,7 +1035,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -11315,7 +11316,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11575,7 +11576,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1035,7 +1044,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -11440,7 +11441,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11700,7 +11701,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1044,7 +1053,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -11456,7 +11457,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11716,7 +11717,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1053,7 +1062,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -11569,7 +11570,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11829,7 +11830,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1062,7 +1071,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -11591,7 +11592,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11851,7 +11852,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 500" Attribute "NickName" "" "HP Officejet Series 500, $Version" Attribute "ShortNickName" "" "HP Officejet Series 500" @@ -1071,7 +1080,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -11631,7 +11632,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11891,7 +11892,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1080,7 +1089,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -11683,7 +11684,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11943,7 +11944,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1089,7 +1098,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -11835,7 +11836,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12095,7 +12096,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1098,7 +1107,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -11859,7 +11860,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12119,7 +12120,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1107,7 +1116,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -11879,7 +11880,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12139,7 +12140,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1116,7 +1125,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -11939,7 +11940,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12199,7 +12200,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1125,7 +1134,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12342,7 +12343,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, $Version" Attribute "ShortNickName" "" "HP Officejet T Series" @@ -1134,7 +1143,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -12093,7 +12094,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12353,7 +12354,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1143,7 +1152,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -12117,7 +12118,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12377,7 +12378,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1152,7 +1161,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -12125,7 +12126,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12385,7 +12386,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1161,7 +1170,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12401,7 +12402,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1170,7 +1179,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -12149,7 +12150,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12409,7 +12410,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1179,7 +1188,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -12166,7 +12167,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12426,7 +12427,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1188,7 +1197,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -12174,7 +12175,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12434,7 +12435,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1197,7 +1206,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -12206,7 +12207,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12466,7 +12467,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1206,7 +1215,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -12214,7 +12215,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12474,7 +12475,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1215,7 +1224,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -12230,7 +12231,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12490,7 +12491,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1224,7 +1233,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -12239,7 +12240,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12499,7 +12500,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1233,7 +1242,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -12255,7 +12256,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12515,7 +12516,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1242,7 +1251,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -12372,7 +12373,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12632,7 +12633,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1251,7 +1260,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -12381,7 +12382,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12641,7 +12642,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1260,7 +1269,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -12492,7 +12493,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12752,7 +12753,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1269,7 +1278,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -12511,7 +12512,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12771,7 +12772,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1278,7 +1287,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -12522,7 +12523,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12782,7 +12783,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1287,7 +1296,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -12636,7 +12637,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12896,7 +12897,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1296,7 +1305,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -12645,7 +12646,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12905,7 +12906,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1305,7 +1314,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -12787,7 +12788,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13047,7 +13048,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" @@ -1314,7 +1323,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -12796,7 +12797,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13056,7 +13057,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" @@ -1323,7 +1332,16 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -13270,7 +13271,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13524,7 +13525,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 2600n" + Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 2600n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2600n;DES:HP Color LaserJet 2600n;" + PCFileName "hp-color_laserjet_2600n.ppd" + Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" + } +@@ -13659,7 +13660,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1332,7 +1350,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -13280,7 +13281,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13669,7 +13670,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1341,7 +1359,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -13574,7 +13575,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13963,7 +13964,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" @@ -1350,7 +1368,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -13582,7 +13583,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13971,7 +13972,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" diff --git a/hplip-env-python.patch b/hplip-env-python.patch new file mode 100644 index 0000000..673165c --- /dev/null +++ b/hplip-env-python.patch @@ -0,0 +1,315 @@ +diff -up hplip-3.10.6/align.py.env_python hplip-3.10.6/align.py +--- hplip-3.10.6/align.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/align.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/check.py.env_python hplip-3.10.6/check.py +--- hplip-3.10.6/check.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/check.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/clean.py.env_python hplip-3.10.6/clean.py +--- hplip-3.10.6/clean.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/clean.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/colorcal.py.env_python hplip-3.10.6/colorcal.py +--- hplip-3.10.6/colorcal.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/colorcal.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/dat2drv.py.env_python hplip-3.10.6/dat2drv.py +--- hplip-3.10.6/dat2drv.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/dat2drv.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2008-9 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/devicesettings.py.env_python hplip-3.10.6/devicesettings.py +--- hplip-3.10.6/devicesettings.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/devicesettings.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/fab.py.env_python hplip-3.10.6/fab.py +--- hplip-3.10.6/fab.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/fab.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/fax/backend/hpfax.py.env_python hplip-3.10.6/fax/backend/hpfax.py +--- hplip-3.10.6/fax/backend/hpfax.py.env_python 2010-07-19 04:17:35.000000000 +0200 ++++ hplip-3.10.6/fax/backend/hpfax.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/faxsetup.py.env_python hplip-3.10.6/faxsetup.py +--- hplip-3.10.6/faxsetup.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/faxsetup.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/firmware.py.env_python hplip-3.10.6/firmware.py +--- hplip-3.10.6/firmware.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/firmware.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/hpdio.py.env_python hplip-3.10.6/hpdio.py +--- hplip-3.10.6/hpdio.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/hpdio.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/hpssd.py.env_python hplip-3.10.6/hpssd.py +--- hplip-3.10.6/hpssd.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/hpssd.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/info.py.env_python hplip-3.10.6/info.py +--- hplip-3.10.6/info.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/info.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/installer/text_install.py.env_python hplip-3.10.6/installer/text_install.py +--- hplip-3.10.6/installer/text_install.py.env_python 2010-07-19 04:17:37.000000000 +0200 ++++ hplip-3.10.6/installer/text_install.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/install.py.env_python hplip-3.10.6/install.py +--- hplip-3.10.6/install.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/install.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/levels.py.env_python hplip-3.10.6/levels.py +--- hplip-3.10.6/levels.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/levels.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/linefeedcal.py.env_python hplip-3.10.6/linefeedcal.py +--- hplip-3.10.6/linefeedcal.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/linefeedcal.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/makecopies.py.env_python hplip-3.10.6/makecopies.py +--- hplip-3.10.6/makecopies.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/makecopies.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/makeuri.py.env_python hplip-3.10.6/makeuri.py +--- hplip-3.10.6/makeuri.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/makeuri.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/pkservice.py.env_python hplip-3.10.6/pkservice.py +--- hplip-3.10.6/pkservice.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/pkservice.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/plugin.py.env_python hplip-3.10.6/plugin.py +--- hplip-3.10.6/plugin.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/plugin.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/pqdiag.py.env_python hplip-3.10.6/pqdiag.py +--- hplip-3.10.6/pqdiag.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/pqdiag.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/print.py.env_python hplip-3.10.6/print.py +--- hplip-3.10.6/print.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/print.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/printsettings.py.env_python hplip-3.10.6/printsettings.py +--- hplip-3.10.6/printsettings.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/printsettings.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/probe.py.env_python hplip-3.10.6/probe.py +--- hplip-3.10.6/probe.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/probe.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/query.py.env_python hplip-3.10.6/query.py +--- hplip-3.10.6/query.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/query.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/scan.py.env_python hplip-3.10.6/scan.py +--- hplip-3.10.6/scan.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/scan.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/scan/sane.py.env_python hplip-3.10.6/scan/sane.py +--- hplip-3.10.6/scan/sane.py.env_python 2010-07-19 04:16:05.000000000 +0200 ++++ hplip-3.10.6/scan/sane.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/sendfax.py.env_python hplip-3.10.6/sendfax.py +--- hplip-3.10.6/sendfax.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/sendfax.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/setup.py.env_python hplip-3.10.6/setup.py +--- hplip-3.10.6/setup.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/setup.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/testpage.py.env_python hplip-3.10.6/testpage.py +--- hplip-3.10.6/testpage.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/testpage.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/timedate.py.env_python hplip-3.10.6/timedate.py +--- hplip-3.10.6/timedate.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/timedate.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/toolbox.py.env_python hplip-3.10.6/toolbox.py +--- hplip-3.10.6/toolbox.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/toolbox.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/unload.py.env_python hplip-3.10.6/unload.py +--- hplip-3.10.6/unload.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/unload.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/wificonfig.py.env_python hplip-3.10.6/wificonfig.py +--- hplip-3.10.6/wificonfig.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/wificonfig.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. diff --git a/hplip.spec b/hplip.spec index 819046c..6fac4b7 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.10.5 -Release: 7%{?dist} +Version: 3.10.6 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,7 +26,7 @@ Patch9: hplip-snmp-quirks.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch -Patch13: hplip-bad-state-attr.patch +Patch13: hplip-env-python.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch @@ -145,6 +145,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP Color LaserJet CM1312nfi (bug #581005). # HP Color LaserJet 3800 (bug #581935). # HP Color LaserJet 2840 (bug #582215). +# HP Color LaserJet CP1518ni (bug #613689). +# HP Color LaserJet 2600n (bug #613712). %patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files @@ -170,8 +172,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons -# Fixed marker-supply attributes in hpijs (bug #605269). -%patch13 -p1 -b .bad-state-attr +# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +%patch13 -p1 -b .env_python # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -444,6 +446,13 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue Jul 27 2010 Jiri Popelka - 3.10.6-1 +- 3.10.6. +- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +- Corrected IEEE 1284 Device IDs: + - HP Color LaserJet CP1518ni (bug #613689). + - HP Color LaserJet 2600n (bug #613712). + * Mon Jun 24 2010 Jiri Popelka - 3.10.5-7 - Added COPYING to common sub-package. diff --git a/sources b/sources index c173d16..751bced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz +96c36e3baf35e93cf9436a772f0c9ef4 hplip-3.10.6.tar.gz From f1d5f72a58a619e363b804402e2f259381f6499b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= Date: Tue, 27 Jul 2010 10:34:11 +0000 Subject: [PATCH 67/69] - 3.10.6. --- .cvsignore | 1 + hplip-3.10.5.tar.gz.asc | 7 ------- hplip-3.10.6.tar.gz.asc | 7 +++++++ hplip-bad-state-attr.patch | 17 ----------------- hplip.spec | 11 +++++------ sources | 2 +- 6 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 hplip-3.10.5.tar.gz.asc create mode 100644 hplip-3.10.6.tar.gz.asc delete mode 100644 hplip-bad-state-attr.patch diff --git a/.cvsignore b/.cvsignore index 43b7aff..d9308e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -33,3 +33,4 @@ hplip-3.9.8.tar.gz hplip-3.10.2.tar.gz hpcups-update-ppds.sh hplip-3.10.5.tar.gz +hplip-3.10.6.tar.gz diff --git a/hplip-3.10.5.tar.gz.asc b/hplip-3.10.5.tar.gz.asc deleted file mode 100644 index 662f63e..0000000 --- a/hplip-3.10.5.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ -wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U -=H4Nc ------END PGP SIGNATURE----- diff --git a/hplip-3.10.6.tar.gz.asc b/hplip-3.10.6.tar.gz.asc new file mode 100644 index 0000000..f8f003c --- /dev/null +++ b/hplip-3.10.6.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkxDtwQACgkQc9dwzaWQR7nApgCcC0cVr7w9rEJdir1Gyl71m9rB +PEsAoK+qjoBn/ksBmhTiNQRYdr/XCE19 +=MeCZ +-----END PGP SIGNATURE----- diff --git a/hplip-bad-state-attr.patch b/hplip-bad-state-attr.patch deleted file mode 100644 index 9c74f35..0000000 --- a/hplip-bad-state-attr.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp ---- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr 2010-06-17 15:11:53.417989598 +0100 -+++ hplip-3.10.5/prnt/hpijs/hpijs.cpp 2010-06-17 15:28:41.169989632 +0100 -@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char * - case WARN_LOW_INK_YELLOW: - case WARN_LOW_INK_MULTIPLE_PENS: - { -- BUG ("STATE: +marker-supply-low-warning\n"); -+ fputs("STATE: +marker-supply-low-warning\n", stderr); - break; - } - default: -- BUG ("STATE: -marker-supply-low-warning\n"); -+ fputs("STATE: -marker-supply-low-warning\n", stderr); - } - } - diff --git a/hplip.spec b/hplip.spec index 3489f97..38c920e 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.10.5 -Release: 6%{?dist} +Version: 3.10.6 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -25,7 +25,6 @@ Patch8: hplip-retry-open.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch -Patch13: hplip-bad-state-attr.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-skip-blank-lines.patch @@ -160,9 +159,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons -# Fixed marker-supply attributes in hpijs (bug #605269). -%patch13 -p1 -b .bad-state-attr - # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -412,6 +408,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue Jul 27 2010 Jiri Popelka - 3.10.6-1 +- 3.10.6. + * Mon Jun 24 2010 Jiri Popelka - 3.10.5-6 - Main package requires explicit version of hplip-libs. diff --git a/sources b/sources index c173d16..751bced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz +96c36e3baf35e93cf9436a772f0c9ef4 hplip-3.10.6.tar.gz From 18b48d7355067c295f1bd5fd59866c8ef852ad06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:47:14 +0000 Subject: [PATCH 68/69] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5abfb6b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: hplip -# $Id: Makefile,v 1.2 2007/10/15 18:52:08 notting Exp $ -NAME := hplip -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From de72625b28010ec689fbd6c302efe2c016db0643 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:47:25 +0000 Subject: [PATCH 69/69] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5abfb6b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: hplip -# $Id: Makefile,v 1.2 2007/10/15 18:52:08 notting Exp $ -NAME := hplip -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12