[hplip/f17] 3.12.11
Jiří Popelka
jpopelka at fedoraproject.org
Tue Nov 27 12:37:19 UTC 2012
commit e56d6f6466b1081e5752367bd0ac4e82749640b7
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue Nov 27 12:11:29 2012 +0100
3.12.11
.gitignore | 1 +
hplip-3.12.10a.tar.gz.asc | 7 -
hplip-3.12.11.tar.gz.asc | 7 +
hplip-IEEE-1284-4.patch | 46 +++---
hplip-deviceIDs-drv.patch | 372 ++++++++++++++++++------------------
hplip-logdir.patch | 126 +++++--------
hplip-makefile-chgrp.patch | 16 +-
hplip-release-parport.patch | 12 --
hplip-snmp-quirks.patch | 10 +-
hplip-systray-dbus-exception.patch | 8 +-
hplip-udev-rules.patch | 14 +-
hplip-ui-optional.patch | 10 +-
hplip.spec | 18 +-
sources | 2 +-
14 files changed, 304 insertions(+), 345 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a711991..1346aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ hplip-3.10.6.tar.gz
/hplip-3.12.9.tar.gz
/hplip-3.12.10.tar.gz
/hplip-3.12.10a.tar.gz
+/hplip-3.12.11.tar.gz
diff --git a/hplip-3.12.11.tar.gz.asc b/hplip-3.12.11.tar.gz.asc
new file mode 100644
index 0000000..7df0767
--- /dev/null
+++ b/hplip-3.12.11.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlCrVGsACgkQc9dwzaWQR7lb0ACg3RMaZRdPeALex3ClAostXvF8
+McMAoO41OLwnkT7Mbl78GPh8kU/Y8Mfy
+=9ARz
+-----END PGP SIGNATURE-----
diff --git a/hplip-IEEE-1284-4.patch b/hplip-IEEE-1284-4.patch
index 022f9f8..1ae1155 100644
--- a/hplip-IEEE-1284-4.patch
+++ b/hplip-IEEE-1284-4.patch
@@ -1,23 +1,23 @@
-diff -up hplip-3.12.9/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.9/io/hpmud/musb.c
---- hplip-3.12.9/io/hpmud/musb.c.hplip-IEEE-1284-4 2012-09-04 14:33:58.000000000 +0200
-+++ hplip-3.12.9/io/hpmud/musb.c 2012-09-20 10:11:53.759116729 +0200
-@@ -708,7 +708,8 @@ static libusb_device *get_libusb_device(
- {
- if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
- (altptr->bInterfaceSubClass == 1) &&
-- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
-+ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
-+ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
- {
- if (is_uri(dev, uri))
- {
-@@ -2061,7 +2062,8 @@ int __attribute__ ((visibility ("hidden"
- {
- if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
- (altptr->bInterfaceSubClass == 1) &&
-- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
-+ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
-+ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
- {
- libusb_open(dev, &hd);
- if (hd == NULL)
+diff -up hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.11/io/hpmud/musb.c
+--- hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 2012-11-20 10:55:09.000000000 +0100
++++ hplip-3.12.11/io/hpmud/musb.c 2012-11-27 11:49:16.633107366 +0100
+@@ -712,7 +712,8 @@ static libusb_device *get_libusb_device(
+ {
+ if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
+ (altptr->bInterfaceSubClass == 1) &&
+- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
++ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
++ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
+ {
+ if (is_uri(dev, uri))
+ {
+@@ -2065,7 +2066,8 @@ int __attribute__ ((visibility ("hidden"
+ {
+ if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
+ (altptr->bInterfaceSubClass == 1) &&
+- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
++ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
++ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
+ {
+ libusb_open(dev, &hd);
+ if (hd == NULL)
diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index 8e8ba88..5a440e1 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv/hpcups.drv.in
---- hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2012-02-01 11:56:31.000000000 +0000
-+++ hplip-3.12.2/prnt/drv/hpcups.drv.in 2012-02-29 13:03:19.665437091 +0000
-@@ -460,7 +460,7 @@ Manufacturer "HP"
+diff -up hplip-3.12.11/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.11/prnt/drv/hpcups.drv.in
+--- hplip-3.12.11/prnt/drv/hpcups.drv.in.deviceIDs-drv 2012-11-20 10:55:29.000000000 +0100
++++ hplip-3.12.11/prnt/drv/hpcups.drv.in 2012-11-27 10:04:50.798926885 +0100
+@@ -467,7 +467,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_v40xi.ppd"
Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)"
}
-@@ -468,7 +468,7 @@ Manufacturer "HP"
+@@ -475,7 +475,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -485,7 +485,7 @@ Manufacturer "HP"
+@@ -492,7 +492,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_g55.ppd"
Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)"
}
-@@ -533,7 +533,7 @@ Manufacturer "HP"
+@@ -540,7 +540,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_g85.ppd"
Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)"
}
-@@ -549,7 +549,7 @@ Manufacturer "HP"
+@@ -556,7 +556,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_g95.ppd"
Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)"
}
-@@ -565,7 +565,7 @@ Manufacturer "HP"
+@@ -572,7 +572,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-psc_750xi.ppd"
Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)"
}
-@@ -573,7 +573,7 @@ Manufacturer "HP"
+@@ -580,7 +580,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-psc_750.ppd"
Attribute "Product" "" "(HP PSC 750 All-in-one Printer)"
}
-@@ -605,7 +605,7 @@ Manufacturer "HP"
+@@ -612,7 +612,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-psc_900_series.ppd"
Attribute "Product" "" "(HP PSC 900 All-in-one Printer)"
}
-@@ -621,7 +621,7 @@ Manufacturer "HP"
+@@ -628,7 +628,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_920c.ppd"
Attribute "Product" "" "(HP Deskjet 920c Printer)"
Attribute "Product" "" "(HP Deskjet 920cvr Printer)"
-@@ -640,7 +640,7 @@ Manufacturer "HP"
+@@ -647,7 +647,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_930c.ppd"
Attribute "Product" "" "(HP Deskjet 930c Printer)"
Attribute "Product" "" "(HP Deskjet 930cm Printer)"
-@@ -681,7 +681,7 @@ Manufacturer "HP"
+@@ -688,7 +688,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_940c.ppd"
Attribute "Product" "" "(HP Deskjet 940cvr Printer)"
Attribute "Product" "" "(HP Deskjet 940c Printer)"
-@@ -700,7 +700,7 @@ Manufacturer "HP"
+@@ -707,7 +707,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_950c.ppd"
Attribute "Product" "" "(HP Deskjet 950c Printer)"
}
-@@ -757,7 +757,7 @@ Manufacturer "HP"
+@@ -764,7 +764,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_959c.ppd"
Attribute "Product" "" "(HP Deskjet 959c Printer)"
}
-@@ -765,7 +765,7 @@ Manufacturer "HP"
+@@ -772,7 +772,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_970c.ppd"
Attribute "Product" "" "(HP Deskjet 970cxi Printer)"
Attribute "Product" "" "(HP Deskjet 970cse Printer)"
-@@ -785,7 +785,7 @@ Manufacturer "HP"
+@@ -792,7 +792,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-photosmart_p1000.ppd"
Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)"
Attribute "Product" "" "(HP Photosmart p1000xi Printer)"
-@@ -794,7 +794,7 @@ Manufacturer "HP"
+@@ -801,7 +801,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-photosmart_p1100.ppd"
Attribute "Product" "" "(HP Photosmart p1100 Printer)"
Attribute "Product" "" "(HP Photosmart p1100xi Printer)"
-@@ -828,7 +828,7 @@ Manufacturer "HP"
+@@ -835,7 +835,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_3820.ppd"
Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)"
Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)"
-@@ -866,7 +866,7 @@ Manufacturer "HP"
+@@ -873,7 +873,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_5105.ppd"
Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)"
}
-@@ -874,7 +874,7 @@ Manufacturer "HP"
+@@ -881,7 +881,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_5110v.ppd"
Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)"
}
-@@ -925,7 +925,7 @@ Manufacturer "HP"
+@@ -932,7 +932,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_1220c.ppd"
Attribute "Product" "" "(HP Deskjet 1220c Printer)"
Attribute "Product" "" "(HP Deskjet 1220cse Printer)"
-@@ -1121,7 +1121,7 @@ Manufacturer "HP"
+@@ -1128,7 +1128,7 @@ Manufacturer "HP"
ModelName "HP 2000c"
Attribute "NickName" "" "HP 2000c, $Version"
Attribute "ShortNickName" "" "HP 2000c"
@@ -190,7 +190,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-2000c.ppd"
Attribute "Product" "" "(HP 2000cse Printer)"
Attribute "Product" "" "(HP 2000c Printer)"
-@@ -1563,7 +1563,7 @@ Manufacturer "HP"
+@@ -1570,7 +1570,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -1586,7 +1586,7 @@ Manufacturer "HP"
+@@ -1593,7 +1593,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_960c.ppd"
Attribute "Product" "" "(HP Deskjet 960cse Printer)"
Attribute "Product" "" "(HP Deskjet 960cxi Printer)"
-@@ -1596,7 +1596,7 @@ Manufacturer "HP"
+@@ -1603,7 +1603,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_980c.ppd"
Attribute "Product" "" "(HP Deskjet 980cxi Printer)"
Attribute "Product" "" "(HP Deskjet 980c Printer)"
-@@ -1605,7 +1605,7 @@ Manufacturer "HP"
+@@ -1612,7 +1612,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_990c.ppd"
Attribute "Product" "" "(HP Deskjet 990cxi Printer)"
Attribute "Product" "" "(HP Deskjet 990cse Printer)"
-@@ -1668,7 +1668,7 @@ Manufacturer "HP"
+@@ -1675,7 +1675,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_inkjet_cp1700.ppd"
Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
}
-@@ -1676,7 +1676,7 @@ Manufacturer "HP"
+@@ -1683,7 +1683,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -1689,7 +1689,7 @@ Manufacturer "HP"
+@@ -1696,7 +1696,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-psc_2150_series.ppd"
Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)"
}
-@@ -1697,7 +1697,7 @@ Manufacturer "HP"
+@@ -1704,7 +1704,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -1734,7 +1734,7 @@ Manufacturer "HP"
+@@ -1741,7 +1741,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -1964,7 +1964,7 @@ Manufacturer "HP"
+@@ -1971,7 +1971,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-business_inkjet_2200.ppd"
Attribute "Product" "" "(HP Business Inkjet 2200 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2200se Printer)"
-@@ -1974,7 +1974,7 @@ Manufacturer "HP"
+@@ -1981,7 +1981,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-business_inkjet_2230.ppd"
Attribute "Product" "" "(HP Business Inkjet 2230 Printer)"
}
-@@ -1982,7 +1982,7 @@ Manufacturer "HP"
+@@ -1989,7 +1989,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-business_inkjet_2250-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2250 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)"
-@@ -1991,7 +1991,7 @@ Manufacturer "HP"
+@@ -1998,7 +1998,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-business_inkjet_2280-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2280 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)"
-@@ -2526,7 +2526,7 @@ Manufacturer "HP"
+@@ -2533,7 +2533,7 @@ Manufacturer "HP"
ModelName "HP PSC 2200 Series"
Attribute "NickName" "" "HP PSC 2200 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 2200 Series"
@@ -316,7 +316,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-psc_2200_series.ppd"
Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)"
}
-@@ -2544,7 +2544,7 @@ Manufacturer "HP"
+@@ -2551,7 +2551,7 @@ Manufacturer "HP"
ModelName "HP PSC 2300 Series"
Attribute "NickName" "" "HP PSC 2300 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 2300 Series"
@@ -325,7 +325,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -2553,7 +2553,7 @@ Manufacturer "HP"
+@@ -2560,7 +2560,7 @@ Manufacturer "HP"
ModelName "HP PSC 2350 Series"
Attribute "NickName" "" "HP PSC 2350 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 2350 Series"
@@ -334,7 +334,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -2570,7 +2570,7 @@ Manufacturer "HP"
+@@ -2577,7 +2577,7 @@ Manufacturer "HP"
ModelName "HP PSC 2400 Series"
Attribute "NickName" "" "HP PSC 2400 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 2400 Series"
@@ -343,7 +343,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -2596,7 +2596,7 @@ Manufacturer "HP"
+@@ -2603,7 +2603,7 @@ Manufacturer "HP"
ModelName "HP PSC 2500 Series"
Attribute "NickName" "" "HP PSC 2500 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 2500 Series"
@@ -352,7 +352,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -3057,7 +3057,7 @@ Manufacturer "HP"
+@@ -3064,7 +3064,7 @@ Manufacturer "HP"
ModelName "HP Officejet j5700 Series"
Attribute "NickName" "" "HP Officejet j5700 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet j5700 Series"
@@ -361,7 +361,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -3130,7 +3130,7 @@ Manufacturer "HP"
+@@ -3137,7 +3137,7 @@ Manufacturer "HP"
ModelName "HP Officejet 6100 Series"
Attribute "NickName" "" "HP Officejet 6100 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 6100 Series"
@@ -370,7 +370,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -3185,7 +3185,7 @@ Manufacturer "HP"
+@@ -3192,7 +3192,7 @@ Manufacturer "HP"
ModelName "HP Officejet 6300 Series"
Attribute "NickName" "" "HP Officejet 6300 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 6300 Series"
@@ -379,7 +379,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -3354,7 +3354,7 @@ Manufacturer "HP"
+@@ -3361,7 +3361,7 @@ Manufacturer "HP"
ModelName "HP Officejet 7200 Series"
Attribute "NickName" "" "HP Officejet 7200 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 7200 Series"
@@ -388,7 +388,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -3439,7 +3439,7 @@ Manufacturer "HP"
+@@ -3446,7 +3446,7 @@ Manufacturer "HP"
ModelName "HP Officejet 7400 Series"
Attribute "NickName" "" "HP Officejet 7400 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 7400 Series"
@@ -397,7 +397,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -9218,7 +9218,7 @@ Manufacturer "HP"
+@@ -10117,7 +10117,7 @@ Manufacturer "HP"
ModelName "HP PSC 1100 Series"
Attribute "NickName" "" "HP PSC 1100 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 1100 Series"
@@ -406,7 +406,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -9228,7 +9228,7 @@ Manufacturer "HP"
+@@ -10127,7 +10127,7 @@ Manufacturer "HP"
ModelName "HP PSC 1200 Series"
Attribute "NickName" "" "HP PSC 1200 Series, $Version"
Attribute "ShortNickName" "" "HP PSC 1200 Series"
@@ -415,7 +415,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -9411,7 +9411,7 @@ Manufacturer "HP"
+@@ -10310,7 +10310,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 3940"
Attribute "NickName" "" "HP Deskjet 3940, $Version"
Attribute "ShortNickName" "" "HP Deskjet 3940"
@@ -424,7 +424,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_3940.ppd"
Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)"
Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)"
-@@ -9420,7 +9420,7 @@ Manufacturer "HP"
+@@ -10319,7 +10319,7 @@ Manufacturer "HP"
ModelName "HP Officejet 4100 Series"
Attribute "NickName" "" "HP Officejet 4100 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 4100 Series"
@@ -433,7 +433,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -9447,7 +9447,7 @@ Manufacturer "HP"
+@@ -10346,7 +10346,7 @@ Manufacturer "HP"
ModelName "HP Officejet 4300 Series"
Attribute "NickName" "" "HP Officejet 4300 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 4300 Series"
@@ -442,7 +442,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -9763,7 +9763,7 @@ Manufacturer "HP"
+@@ -10662,7 +10662,7 @@ Manufacturer "HP"
ModelName "HP Officejet j3600 Series"
Attribute "NickName" "" "HP Officejet j3600 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet j3600 Series"
@@ -451,7 +451,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -9834,7 +9834,7 @@ Manufacturer "HP"
+@@ -10733,7 +10733,7 @@ Manufacturer "HP"
ModelName "HP Officejet 4200 Series"
Attribute "NickName" "" "HP Officejet 4200 Series, $Version"
Attribute "ShortNickName" "" "HP Officejet 4200 Series"
@@ -460,7 +460,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -10341,6 +10341,7 @@ Manufacturer "HP"
+@@ -11240,6 +11240,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;"
@@ -468,7 +468,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -10768,7 +10769,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11667,7 +11668,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"
@@ -477,7 +477,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4_plus-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4 Plus Printer)"
Attribute "Product" "" "(HP LaserJet 4m Plus Printer)"
-@@ -10794,7 +10795,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11693,7 +11694,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 5l"
Attribute "NickName" "" "HP LaserJet 5l, $Version"
Attribute "ShortNickName" "" "HP LaserJet 5l"
@@ -486,7 +486,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_5l.ppd"
Attribute "Product" "" "(HP LaserJet 5l Printer)"
Attribute "Product" "" "(HP LaserJet 5l-fs Printer)"
-@@ -10804,7 +10805,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11703,7 +11704,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_5mp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5mp Printer)"
}
-@@ -10812,7 +10813,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11711,7 +11712,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 5p"
Attribute "NickName" "" "HP LaserJet 5p, $Version"
Attribute "ShortNickName" "" "HP LaserJet 5p"
@@ -504,7 +504,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_5p.ppd"
Attribute "Product" "" "(HP LaserJet 5p Printer)"
}
-@@ -10820,7 +10821,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11719,7 +11720,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 6l"
Attribute "NickName" "" "HP LaserJet 6l, $Version"
Attribute "ShortNickName" "" "HP LaserJet 6l"
@@ -513,7 +513,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_6l.ppd"
Attribute "Product" "" "(HP LaserJet 6l Printer)"
Attribute "Product" "" "(HP LaserJet 6lse Printer)"
-@@ -10832,7 +10833,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11731,7 +11732,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 6p"
Attribute "NickName" "" "HP LaserJet 6p, $Version"
Attribute "ShortNickName" "" "HP LaserJet 6p"
@@ -522,7 +522,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_6p.ppd"
Attribute "Product" "" "(HP LaserJet 6p Printer)"
}
-@@ -10840,7 +10841,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11739,7 +11740,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 6mp"
Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 6mp"
@@ -531,7 +531,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_6mp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 6mp Printer)"
Attribute "Product" "" "(HP LaserJet 6mp Se Printer)"
-@@ -10850,7 +10851,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11749,7 +11750,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1015"
Attribute "NickName" "" "HP LaserJet 1015, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1015"
@@ -540,7 +540,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1015.ppd"
Attribute "Product" "" "(HP LaserJet 1015 Printer)"
}
-@@ -10892,7 +10893,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11791,7 +11792,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1100"
Attribute "NickName" "" "HP LaserJet 1100, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1100"
@@ -549,7 +549,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1100.ppd"
Attribute "Product" "" "(HP LaserJet 1100 Printer)"
Attribute "Product" "" "(HP LaserJet 1100se Printer)"
-@@ -10910,7 +10911,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11809,7 +11810,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1150"
Attribute "NickName" "" "HP LaserJet 1150, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1150"
@@ -558,7 +558,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1150.ppd"
Attribute "Product" "" "(HP LaserJet 1150 Printer)"
}
-@@ -10927,7 +10928,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11826,7 +11827,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"
@@ -567,7 +567,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1160_series.ppd"
Attribute "Product" "" "(HP LaserJet 1160 Series Printer)"
}
-@@ -10935,7 +10936,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11834,7 +11835,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1200"
Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1200"
@@ -576,7 +576,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1200 Printer)"
Attribute "Product" "" "(HP LaserJet 1200se Printer)"
-@@ -10960,7 +10961,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11859,7 +11860,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1220"
Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1220"
@@ -585,7 +585,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1220-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)"
}
-@@ -10968,7 +10969,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11867,7 +11868,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1300"
Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1300"
@@ -594,7 +594,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1300 Printer)"
Attribute "Product" "" "(HP LaserJet 1300t Printer)"
-@@ -10993,7 +10994,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11892,7 +11893,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"
@@ -603,7 +603,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1320_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1320 Series Printer)"
}
-@@ -11017,7 +11018,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11916,7 +11917,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1320"
Attribute "NickName" "" "HP LaserJet 1320, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1320"
@@ -612,7 +612,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1320.ppd"
Attribute "Product" "" "(HP LaserJet 1320 Printer)"
Attribute "Product" "" "(HP LaserJet 1320t Printer)"
-@@ -11042,7 +11043,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11941,7 +11942,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet m1522nf MFP"
Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP"
@@ -621,7 +621,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)"
}
-@@ -11122,7 +11123,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12013,7 +12014,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.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p2015_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet p2015 Printer)"
}
-@@ -11146,7 +11147,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12037,7 +12038,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p2035"
Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LaserJet p2035"
@@ -639,7 +639,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p2035-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet p2035 Printer)"
}
-@@ -11186,7 +11187,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12077,7 +12078,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2100"
Attribute "NickName" "" "HP LaserJet 2100, $Version"
Attribute "ShortNickName" "" "HP LaserJet 2100"
@@ -648,7 +648,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2100.ppd"
Attribute "Product" "" "(HP LaserJet 2100 Printer)"
Attribute "Product" "" "(HP LaserJet 2100m Printer)"
-@@ -11198,7 +11199,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12089,7 +12090,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"
@@ -657,7 +657,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2100_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2100 Series Printer)"
}
-@@ -11214,7 +11215,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12105,7 +12106,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2200"
Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 2200"
@@ -666,7 +666,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2200 Printer)"
Attribute "Product" "" "(HP LaserJet 2200d Printer)"
-@@ -11227,7 +11228,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12118,7 +12119,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2300"
Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 2300"
@@ -675,7 +675,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2300 Printer)"
Attribute "Product" "" "(HP LaserJet 2300n Printer)"
-@@ -11240,7 +11241,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12131,7 +12132,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"
@@ -684,7 +684,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2300_series.ppd"
Attribute "Product" "" "(HP LaserJet 2300 Series Printer)"
}
-@@ -11256,7 +11257,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12147,7 +12148,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2420"
Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 2420"
@@ -693,7 +693,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2420-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2420 Printer)"
Attribute "Product" "" "(HP LaserJet 2420d Printer)"
-@@ -11267,7 +11268,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12158,7 +12159,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 2430"
Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 2430"
@@ -702,7 +702,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_2430-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2430t Printer)"
Attribute "Product" "" "(HP LaserJet 2430 Printer)"
-@@ -11295,7 +11296,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12186,7 +12187,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p3005"
Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet p3005"
@@ -711,7 +711,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p3005-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet p3005 Printer)"
Attribute "Product" "" "(HP LaserJet p3005d Printer)"
-@@ -11308,7 +11309,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12199,7 +12200,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p3010 Series"
Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet p3010 Series"
@@ -720,7 +720,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p3010_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet p3015 Printer)"
Attribute "Product" "" "(HP LaserJet p3011 Printer)"
-@@ -11317,7 +11318,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12208,7 +12209,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3015"
Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3015"
@@ -729,7 +729,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3015-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)"
}
-@@ -11325,7 +11326,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12216,7 +12217,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3020"
Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3020"
@@ -738,7 +738,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3020-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)"
}
-@@ -11333,7 +11334,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12224,7 +12225,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"
@@ -747,7 +747,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)"
-@@ -11342,7 +11343,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12233,7 +12234,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3030"
Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3030"
@@ -756,7 +756,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3030-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)"
}
-@@ -11350,7 +11351,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12241,7 +12242,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3050"
Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3050"
@@ -765,7 +765,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -11359,7 +11360,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12250,7 +12251,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3052"
Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3052"
@@ -774,7 +774,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3052-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)"
}
-@@ -11367,7 +11368,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12258,7 +12259,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3055"
Attribute "NickName" "" "HP LaserJet 3055, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3055"
@@ -783,7 +783,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3055.ppd"
Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)"
}
-@@ -11395,7 +11396,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12286,7 +12287,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3200m"
Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3200m"
@@ -792,7 +792,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3200m-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)"
}
-@@ -11411,7 +11412,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12302,7 +12303,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3200"
Attribute "NickName" "" "HP LaserJet 3200, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3200"
@@ -801,7 +801,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3200.ppd"
Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)"
}
-@@ -11431,7 +11432,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12322,7 +12323,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3330"
Attribute "NickName" "" "HP LaserJet 3330, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3330"
@@ -810,7 +810,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3330.ppd"
Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)"
}
-@@ -11439,7 +11440,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12330,7 +12331,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3380"
Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3380"
@@ -819,7 +819,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3380-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)"
}
-@@ -11447,7 +11448,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 3390"
Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 3390"
@@ -828,7 +828,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_3390-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)"
}
-@@ -11463,7 +11464,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12354,7 +12355,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"
@@ -837,7 +837,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4000_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4000 Printer)"
Attribute "Product" "" "(HP LaserJet 4000n Printer)"
-@@ -11491,7 +11492,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12374,7 +12375,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p4014"
Attribute "NickName" "" "HP LaserJet p4014, $Version"
Attribute "ShortNickName" "" "HP LaserJet p4014"
@@ -846,7 +846,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p4014.ppd"
Attribute "Product" "" "(HP LaserJet p4014 Printer)"
}
-@@ -11539,7 +11540,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12430,7 +12431,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"
@@ -855,7 +855,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4050_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4050 Printer)"
Attribute "Product" "" "(HP LaserJet 4050n Printer)"
-@@ -11560,7 +11561,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12451,7 +12452,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"
@@ -864,7 +864,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4100_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 410dtn Printer)"
Attribute "Product" "" "(HP LaserJet 4100tn Printer)"
-@@ -11579,7 +11580,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12470,7 +12471,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 4200"
Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 4200"
@@ -873,7 +873,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4200 Printer)"
Attribute "Product" "" "(HP LaserJet 4200l Printer)"
-@@ -11604,7 +11605,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12495,7 +12496,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 4250"
Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 4250"
@@ -882,7 +882,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4250-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4250 Printer)"
Attribute "Product" "" "(HP LaserJet 4250dtn Printer)"
-@@ -11616,7 +11617,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12507,7 +12508,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 4300"
Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 4300"
@@ -891,7 +891,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4300 Printer)"
Attribute "Product" "" "(HP LaserJet 4300dtn Printer)"
-@@ -11629,7 +11630,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12520,7 +12521,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"
@@ -900,7 +900,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4345_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)"
-@@ -11640,7 +11641,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12531,7 +12532,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"
@@ -909,7 +909,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)"
-@@ -11659,7 +11660,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12550,7 +12551,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 4350"
Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 4350"
@@ -918,7 +918,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_4350-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4350 Printer)"
Attribute "Product" "" "(HP LaserJet 4350dtn Printer)"
-@@ -11695,7 +11696,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12586,7 +12587,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p4515"
Attribute "NickName" "" "HP LaserJet p4515, $Version"
Attribute "ShortNickName" "" "HP LaserJet p4515"
@@ -927,7 +927,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p4515.ppd"
Attribute "Product" "" "(HP LaserJet p4515 Printer)"
}
-@@ -11711,7 +11712,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12602,7 +12603,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"
@@ -936,7 +936,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_5000_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5000 Series Printer)"
}
-@@ -11727,7 +11728,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12618,7 +12619,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 8000 Series"
Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 8000 Series"
@@ -945,7 +945,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_8000_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 8000 Series Printer)"
}
-@@ -11821,7 +11822,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12712,7 +12713,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 5si"
Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 5si"
@@ -954,7 +954,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_5si-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5si Printer)"
Attribute "Product" "" "(HP LaserJet 5si Hm Printer)"
-@@ -11857,7 +11858,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12748,7 +12749,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"
@@ -963,7 +963,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)"
-@@ -11878,7 +11879,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12769,7 +12770,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"
@@ -972,7 +972,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)"
}
-@@ -11886,7 +11887,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12777,7 +12778,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"
@@ -981,7 +981,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)"
-@@ -11904,7 +11905,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12795,7 +12796,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 5100 Series"
Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version"
Attribute "ShortNickName" "" "HP LaserJet 5100 Series"
@@ -990,7 +990,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_5100_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5100 Printer)"
Attribute "Product" "" "(HP LaserJet 5100le Printer)"
-@@ -11935,7 +11936,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12826,7 +12827,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 8000"
Attribute "NickName" "" "HP LaserJet 8000, $Version"
Attribute "ShortNickName" "" "HP LaserJet 8000"
@@ -999,7 +999,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_8000.ppd"
Attribute "Product" "" "(HP LaserJet 8000 Printer)"
Attribute "Product" "" "(HP LaserJet 8000dn Printer)"
-@@ -11955,7 +11956,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12846,7 +12847,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"
@@ -1008,7 +1008,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_8150_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 8150 Printer)"
Attribute "Product" "" "(HP LaserJet 8150n Printer)"
-@@ -12159,7 +12160,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13050,7 +13051,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"
@@ -1017,7 +1017,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)"
}
-@@ -12247,7 +12248,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13138,7 +13139,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp1515n"
Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cp1515n"
@@ -1026,7 +1026,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)"
}
-@@ -12255,7 +12256,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13146,7 +13147,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"
@@ -1035,7 +1035,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)"
}
-@@ -12263,7 +12264,9 @@ Group "RLT/HP Real Life Technologies"
+@@ -13154,7 +13155,9 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp2025dn"
Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn"
@@ -1046,7 +1046,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)"
}
-@@ -12279,7 +12282,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13170,7 +13173,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp2025n"
Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cp2025n"
@@ -1055,7 +1055,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)"
}
-@@ -12295,7 +12298,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13186,7 +13189,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"
@@ -1064,7 +1064,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-business_inkjet_2300-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -12305,7 +12308,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13196,7 +13199,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 2500"
Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 2500"
@@ -1073,7 +1073,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_2500-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 2500 Printer)"
}
-@@ -12346,7 +12349,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13237,7 +13240,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp3525"
Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cp3525"
@@ -1082,7 +1082,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cp3525-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)"
Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)"
-@@ -12357,7 +12360,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13248,7 +13251,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cm3530 MFP"
Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP"
@@ -1091,7 +1091,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)"
Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)"
-@@ -12366,7 +12369,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13257,7 +13260,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 3700"
Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 3700"
@@ -1100,7 +1100,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_3700-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 3700 Printer)"
}
-@@ -12385,7 +12388,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13276,7 +13279,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"
@@ -1109,7 +1109,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_3800-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
-@@ -12424,7 +12427,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13315,7 +13318,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cp4520 Series"
Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series"
@@ -1118,7 +1118,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)"
}
-@@ -12440,7 +12443,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13331,7 +13334,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"
@@ -1127,7 +1127,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_4550-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 4550 Printer)"
Attribute "Product" "" "(HP Color LaserJet 4550n Printer)"
-@@ -12453,7 +12456,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13344,7 +13347,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"
@@ -1136,7 +1136,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_4600_series.ppd"
Attribute "Product" "" "(HP Color LaserJet 4600 Printer)"
Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)"
-@@ -12465,7 +12468,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13356,7 +13359,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 4600"
Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 4600"
@@ -1145,7 +1145,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_4600-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)"
}
-@@ -12481,7 +12484,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13372,7 +13375,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 4650"
Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 4650"
@@ -1154,7 +1154,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_4650-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 4650 Printer)"
Attribute "Product" "" "(HP Color LaserJet 4650n Printer)"
-@@ -12493,7 +12496,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13384,7 +13387,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 4700"
Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 4700"
@@ -1163,7 +1163,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_4700-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 4700 Printer)"
Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)"
-@@ -12505,7 +12508,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13396,7 +13399,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cm4730 MFP"
Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP"
@@ -1172,7 +1172,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)"
Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)"
-@@ -12559,7 +12562,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13450,7 +13453,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"
@@ -1181,7 +1181,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -12603,7 +12606,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13478,7 +13481,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cm2320nf MFP"
Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP"
@@ -1190,7 +1190,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)"
}
-@@ -12643,7 +12646,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13534,7 +13537,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"
@@ -1199,7 +1199,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-business_inkjet_2800-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -12678,7 +12681,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13569,7 +13572,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet 5550"
Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 5550"
@@ -1208,7 +1208,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_5550-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 5550n Printer)"
Attribute "Product" "" "(HP Color LaserJet 5550 Printer)"
-@@ -12935,7 +12938,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13826,7 +13829,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1010"
Attribute "NickName" "" "HP LaserJet 1010, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1010"
@@ -1217,7 +1217,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1010.ppd"
Attribute "Product" "" "(HP LaserJet 1010 Printer)"
}
-@@ -12943,7 +12946,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13834,7 +13837,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1012"
Attribute "NickName" "" "HP LaserJet 1012, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1012"
@@ -1226,7 +1226,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1012.ppd"
Attribute "Product" "" "(HP LaserJet 1012 Printer)"
}
-@@ -13151,7 +13154,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14042,7 +14045,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet Lx"
Attribute "NickName" "" "HP Officejet Lx, $Version"
Attribute "ShortNickName" "" "HP Officejet Lx"
@@ -1235,7 +1235,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_lx.ppd"
Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
}
-@@ -13315,7 +13318,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14206,7 +14209,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"
@@ -1244,7 +1244,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_series_300.ppd"
Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
}
-@@ -13339,7 +13342,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14230,7 +14233,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 400"
Attribute "NickName" "" "HP Deskjet 400, $Version"
Attribute "ShortNickName" "" "HP Deskjet 400"
@@ -1253,7 +1253,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_400.ppd"
Attribute "Product" "" "(HP Deskjet 400 Printer)"
Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -13356,7 +13359,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14247,7 +14250,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 540"
Attribute "NickName" "" "HP Deskjet 540, $Version"
Attribute "ShortNickName" "" "HP Deskjet 540"
@@ -1262,7 +1262,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_540.ppd"
Attribute "Product" "" "(HP Deskjet 540 Printer)"
}
-@@ -13481,7 +13484,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14372,7 +14375,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 630c"
Attribute "NickName" "" "HP Deskjet 630c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 630c"
@@ -1271,7 +1271,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_630c.ppd"
Attribute "Product" "" "(HP Deskjet 630c Printer)"
}
-@@ -13497,7 +13500,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14388,7 +14391,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 656c"
Attribute "NickName" "" "HP Deskjet 656c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 656c"
@@ -1280,7 +1280,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_656c.ppd"
Attribute "Product" "" "(HP Deskjet 656c Printer)"
Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -13610,7 +13613,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14501,7 +14504,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 600"
Attribute "NickName" "" "HP Deskjet 600, $Version"
Attribute "ShortNickName" "" "HP Deskjet 600"
@@ -1289,7 +1289,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_600.ppd"
Attribute "Product" "" "(HP Deskjet 600c Printer)"
Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -13672,7 +13675,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14555,7 +14558,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"
@@ -1298,7 +1298,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_series_600.ppd"
Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
}
-@@ -13724,7 +13727,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14607,7 +14610,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 670c"
Attribute "NickName" "" "HP Deskjet 670c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 670c"
@@ -1307,7 +1307,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_670c.ppd"
Attribute "Product" "" "(HP Deskjet 670c)"
}
-@@ -13876,7 +13879,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14759,7 +14762,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 610c"
Attribute "NickName" "" "HP Deskjet 610c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 610c"
@@ -1316,7 +1316,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_610c.ppd"
Attribute "Product" "" "(HP Deskjet 610c Printer)"
}
-@@ -13900,7 +13903,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14783,7 +14786,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 640c"
Attribute "NickName" "" "HP Deskjet 640c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 640c"
@@ -1325,7 +1325,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_640c.ppd"
Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -13920,7 +13923,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14803,7 +14806,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 690c"
Attribute "NickName" "" "HP Deskjet 690c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 690c"
@@ -1334,7 +1334,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_690c.ppd"
Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
Attribute "Product" "" "(HP Deskjet 690c Printer)"
-@@ -13980,7 +13983,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14863,7 +14866,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"
@@ -1343,7 +1343,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_series_700.ppd"
Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
}
-@@ -14123,7 +14126,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15006,7 +15009,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"
@@ -1352,7 +1352,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -14134,7 +14137,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15017,7 +15020,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r40"
Attribute "NickName" "" "HP Officejet r40, $Version"
Attribute "ShortNickName" "" "HP Officejet r40"
@@ -1361,7 +1361,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_r40.ppd"
Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)"
}
-@@ -14158,7 +14161,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15041,7 +15044,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r60"
Attribute "NickName" "" "HP Officejet r60, $Version"
Attribute "ShortNickName" "" "HP Officejet r60"
@@ -1370,7 +1370,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_r60.ppd"
Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)"
}
-@@ -14166,7 +14169,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15049,7 +15052,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r65"
Attribute "NickName" "" "HP Officejet r65, $Version"
Attribute "ShortNickName" "" "HP Officejet r65"
@@ -1379,7 +1379,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_r65.ppd"
Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)"
}
-@@ -14182,7 +14185,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15065,7 +15068,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r80"
Attribute "NickName" "" "HP Officejet r80, $Version"
Attribute "ShortNickName" "" "HP Officejet r80"
@@ -1388,7 +1388,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-officejet_r80.ppd"
Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)"
}
-@@ -14190,7 +14193,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15073,7 +15076,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP PSC 500"
Attribute "NickName" "" "HP PSC 500, $Version"
Attribute "ShortNickName" "" "HP PSC 500"
@@ -1397,7 +1397,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -14207,7 +14210,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15090,7 +15093,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 812c"
Attribute "NickName" "" "HP Deskjet 812c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 812c"
@@ -1406,7 +1406,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_812c.ppd"
Attribute "Product" "" "(HP Deskjet 812c Printer)"
}
-@@ -14215,7 +14218,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15098,7 +15101,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 815c"
Attribute "NickName" "" "HP Deskjet 815c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 815c"
@@ -1415,7 +1415,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_815c.ppd"
Attribute "Product" "" "(HP Deskjet 815c Printer)"
}
-@@ -14247,7 +14250,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15130,7 +15133,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 840c"
Attribute "NickName" "" "HP Deskjet 840c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 840c"
@@ -1424,7 +1424,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_840c.ppd"
Attribute "Product" "" "(HP Deskjet 840c Printer)"
}
-@@ -14255,7 +14258,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15138,7 +15141,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 841c"
Attribute "NickName" "" "HP Deskjet 841c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 841c"
@@ -1433,7 +1433,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_841c.ppd"
Attribute "Product" "" "(HP Deskjet 841c Printer)"
}
-@@ -14271,7 +14274,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15154,7 +15157,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 843c"
Attribute "NickName" "" "HP Deskjet 843c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 843c"
@@ -1442,7 +1442,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_843c.ppd"
Attribute "Product" "" "(HP Deskjet 843c Printer)"
Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -14280,7 +14283,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15163,7 +15166,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 880c"
Attribute "NickName" "" "HP Deskjet 880c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 880c"
@@ -1451,7 +1451,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_880c.ppd"
Attribute "Product" "" "(HP Deskjet 880c Printer)"
}
-@@ -14296,7 +14299,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15179,7 +15182,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 895c"
Attribute "NickName" "" "HP Deskjet 895c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 895c"
@@ -1460,7 +1460,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_895c.ppd"
Attribute "Product" "" "(HP Deskjet 895cse Printer)"
Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -14413,7 +14416,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15296,7 +15299,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 825c"
Attribute "NickName" "" "HP Deskjet 825c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 825c"
@@ -1469,7 +1469,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_825c.ppd"
Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -14422,7 +14425,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15305,7 +15308,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 845c"
Attribute "NickName" "" "HP Deskjet 845c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 845c"
@@ -1478,7 +1478,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_845c.ppd"
Attribute "Product" "" "(HP Deskjet 845c Printer)"
Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -14533,7 +14536,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15416,7 +15419,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 850c"
Attribute "NickName" "" "HP Deskjet 850c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 850c"
@@ -1487,7 +1487,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_850c.ppd"
Attribute "Product" "" "(HP Deskjet 850k Printer)"
Attribute "Product" "" "(HP Deskjet 850c Printer)"
-@@ -14552,7 +14555,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15435,7 +15438,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 870c"
Attribute "NickName" "" "HP Deskjet 870c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 870c"
@@ -1496,7 +1496,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_870c.ppd"
Attribute "Product" "" "(HP Deskjet 870k Printer)"
Attribute "Product" "" "(HP Deskjet 870c Printer)"
-@@ -14563,7 +14566,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15446,7 +15449,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"
@@ -1505,7 +1505,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -14677,7 +14680,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15560,7 +15563,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 890c"
Attribute "NickName" "" "HP Deskjet 890c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 890c"
@@ -1514,7 +1514,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_890c.ppd"
Attribute "Product" "" "(HP Deskjet 890cse Printer)"
Attribute "Product" "" "(HP Deskjet 890c Printer)"
-@@ -14686,7 +14689,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15569,7 +15572,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"
@@ -1523,7 +1523,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.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)"
-@@ -14828,7 +14831,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15711,7 +15714,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"
@@ -1532,7 +1532,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1018.ppd"
Attribute "Product" "" "(HP LaserJet 1018 Printer)"
Attribute "Product" "" "(HP LaserJet 1018s Printer)"
-@@ -14837,7 +14840,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15720,7 +15723,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"
@@ -1541,7 +1541,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_1020.ppd"
Attribute "Product" "" "(HP LaserJet 1020 Printer)"
Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)"
-@@ -14871,7 +14874,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15754,7 +15757,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet m1120 MFP"
Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LaserJet m1120 MFP"
@@ -1550,7 +1550,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m1120_mfp.ppd"
Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)"
}
-@@ -14887,7 +14890,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15770,7 +15773,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet m1319f MFP"
Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LaserJet m1319f MFP"
@@ -1559,7 +1559,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m1319f_mfp.ppd"
Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)"
}
-@@ -14903,7 +14906,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15786,7 +15789,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p2035"
Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LaserJet p2035"
@@ -1568,7 +1568,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p2035-zjs.ppd"
Attribute "Product" "" "(HP LaserJet p2035 Printer)"
}
-@@ -15003,7 +15006,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15878,7 +15881,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet Professional p1102w"
Attribute "NickName" "" "HP LaserJet Professional p1102w, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LaserJet Professional p1102w"
@@ -1577,7 +1577,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_professional_p1102w.ppd"
Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
}
-@@ -15059,7 +15062,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16008,7 +16011,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet Professional m1212nf MFP"
Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP"
@@ -1586,7 +1586,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd"
Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)"
}
-@@ -15239,7 +15242,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16244,7 +16247,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet Professional p1606dn"
Attribute "NickName" "" "HP LaserJet Professional p1606dn, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LJ Professional p1606dn"
@@ -1595,7 +1595,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_professional_p1606dn.ppd"
Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)"
}
-@@ -15389,7 +15392,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16418,7 +16421,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"
@@ -1604,7 +1604,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_2600n.ppd"
Attribute "Product" "" "(HP Color LaserJet 2600n Printer)"
}
-@@ -15589,7 +15592,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16594,7 +16597,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"
@@ -1613,7 +1613,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_3500.ppd"
Attribute "Product" "" "(HP Color LaserJet 3500 Printer)"
Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)"
-@@ -15599,7 +15602,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16604,7 +16607,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"
@@ -1622,7 +1622,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-color_laserjet_3550.ppd"
Attribute "Product" "" "(HP Color LaserJet 3550 Printer)"
}
-@@ -15751,7 +15754,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16756,7 +16759,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p1505"
Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin"
Attribute "ShortNickName" "" "HP LaserJet p1505"
@@ -1631,7 +1631,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p1505.ppd"
Attribute "Product" "" "(HP LaserJet p1505 Printer)"
}
-@@ -15893,7 +15896,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16898,7 +16901,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"
@@ -1640,7 +1640,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_p1006.ppd"
Attribute "Product" "" "(HP LaserJet p1006 Printer)"
}
-@@ -15901,7 +15904,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16906,7 +16909,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-logdir.patch b/hplip-logdir.patch
index abf7bdf..aeb49da 100644
--- a/hplip-logdir.patch
+++ b/hplip-logdir.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.12.10a/fax/backend/hpfax.py.logdir hplip-3.12.10a/fax/backend/hpfax.py
---- hplip-3.12.10a/fax/backend/hpfax.py.logdir 2012-10-17 09:56:43.979656073 +0100
-+++ hplip-3.12.10a/fax/backend/hpfax.py 2012-10-17 09:57:33.286890599 +0100
+diff -up hplip-3.12.11/fax/backend/hpfax.py.logdir hplip-3.12.11/fax/backend/hpfax.py
+--- hplip-3.12.11/fax/backend/hpfax.py.logdir 2012-11-20 10:55:06.000000000 +0100
++++ hplip-3.12.11/fax/backend/hpfax.py 2012-11-27 10:09:25.298698254 +0100
@@ -244,7 +244,7 @@ else:
input_fd = 0
@@ -10,9 +10,9 @@ diff -up hplip-3.12.10a/fax/backend/hpfax.py.logdir hplip-3.12.10a/fax/backend/h
pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id)
-diff -up hplip-3.12.10a/logcapture.py.logdir hplip-3.12.10a/logcapture.py
---- hplip-3.12.10a/logcapture.py.logdir 2012-10-10 07:14:21.000000000 +0100
-+++ hplip-3.12.10a/logcapture.py 2012-10-17 09:56:29.396578082 +0100
+diff -up hplip-3.12.11/logcapture.py.logdir hplip-3.12.11/logcapture.py
+--- hplip-3.12.11/logcapture.py.logdir 2012-11-20 10:55:15.000000000 +0100
++++ hplip-3.12.11/logcapture.py 2012-11-27 10:09:25.298698254 +0100
@@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o
LOG_FOLDER_PATH='./'
LOG_FOLDER_NAME='hplip_troubleshoot_logs'
@@ -31,9 +31,9 @@ diff -up hplip-3.12.10a/logcapture.py.logdir hplip-3.12.10a/logcapture.py
if File_list:
sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
if sts != 0:
-diff -up hplip-3.12.10a/prnt/filters/hplipjs.c.logdir hplip-3.12.10a/prnt/filters/hplipjs.c
---- hplip-3.12.10a/prnt/filters/hplipjs.c.logdir 2012-10-17 09:58:20.298135510 +0100
-+++ hplip-3.12.10a/prnt/filters/hplipjs.c 2012-10-17 09:58:47.431276326 +0100
+diff -up hplip-3.12.11/prnt/filters/hplipjs.c.logdir hplip-3.12.11/prnt/filters/hplipjs.c
+--- hplip-3.12.11/prnt/filters/hplipjs.c.logdir 2012-11-20 10:50:44.000000000 +0100
++++ hplip-3.12.11/prnt/filters/hplipjs.c 2012-11-27 10:09:25.299698225 +0100
@@ -275,7 +275,8 @@ int main (int argc, char **argv)
{
fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
@@ -44,9 +44,9 @@ diff -up hplip-3.12.10a/prnt/filters/hplipjs.c.logdir hplip-3.12.10a/prnt/filter
HPFp = fopen (szPSFile, "w");
#endif
-diff -up hplip-3.12.10a/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.10a/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.12.10a/prnt/hpcups/HPCupsFilter.cpp.logdir 2012-10-17 09:56:29.391578055 +0100
-+++ hplip-3.12.10a/prnt/hpcups/HPCupsFilter.cpp 2012-10-17 09:56:29.397578087 +0100
+diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir 2012-11-27 10:09:25.291698453 +0100
++++ hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp 2012-11-27 10:13:34.958640524 +0100
@@ -31,16 +31,24 @@
\*****************************************************************************/
@@ -85,21 +85,34 @@ diff -up hplip-3.12.10a/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.10a/prnt/
while (cupsRasterReadHeader2(cups_raster, &cups_header))
-@@ -647,9 +656,9 @@ int HPCupsFilter::processRasterData(cups
+@@ -647,13 +656,13 @@ int HPCupsFilter::processRasterData(cups
if (m_iLogLevel & SAVE_INPUT_RASTERS)
{
- char szFileName[64];
+ char szFileName[PATH_MAX];
memset(szFileName, 0, sizeof(szFileName));
-- snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp", current_page_number);
-+ snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_%d.bmp", env_tmpdir, current_page_number);
if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
cups_header.cupsColorSpace == CUPS_CSPACE_RGB)
-diff -up hplip-3.12.10a/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.10a/prnt/hpcups/LJZjStream.cpp
---- hplip-3.12.10a/prnt/hpcups/LJZjStream.cpp.logdir 2012-10-10 07:08:46.000000000 +0100
-+++ hplip-3.12.10a/prnt/hpcups/LJZjStream.cpp 2012-10-17 09:56:29.397578087 +0100
+ {
+- snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp", current_page_number);
++ snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_%d.bmp", env_tmpdir, current_page_number);
+ cfp = fopen (szFileName, "w");
+ chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+ }
+@@ -661,7 +670,7 @@ int HPCupsFilter::processRasterData(cups
+ if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
+ cups_header.cupsColorSpace == CUPS_CSPACE_K)
+ {
+- snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterk_%d.bmp", current_page_number);
++ snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterk_%d.bmp", env_tmpdir, current_page_number);
+ kfp = fopen (szFileName, "w");
+ chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+ }
+diff -up hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.11/prnt/hpcups/LJZjStream.cpp
+--- hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir 2012-11-20 10:49:20.000000000 +0100
++++ hplip-3.12.11/prnt/hpcups/LJZjStream.cpp 2012-11-27 10:16:24.878547224 +0100
@@ -42,9 +42,12 @@
#include "LJZjStream.h"
#include "Utils.h"
@@ -117,20 +130,20 @@ diff -up hplip-3.12.10a/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.10a/prnt/hp
cups_raster_t *even_pages_raster=NULL;
cups_raster_t *odd_pages_raster = NULL;
BYTE* pPageDataBuffer = NULL;
-- char hpEvenPagesFile[64];
-- char hpOddPagesFile[64];
+- char hpEvenPagesFile[64]={0,};
+- char hpOddPagesFile[64]={0,};
- snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX","/var/log/hp/tmp");
- snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", "/var/log/hp/tmp");
-+ char hpEvenPagesFile[PATH_MAX];
-+ char hpOddPagesFile[PATH_MAX];
-+ snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX",env_tmpdir);
++ char hpEvenPagesFile[PATH_MAX]={0,};
++ char hpOddPagesFile[PATH_MAX]={0,};
++ snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX", env_tmpdir);
+ snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", env_tmpdir);
- if (1 != m_pJA->pre_process_raster || !cups_header.Duplex){
+ if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){
return NO_ERROR;
-diff -up hplip-3.12.10a/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.10a/prnt/hpcups/SystemServices.cpp
---- hplip-3.12.10a/prnt/hpcups/SystemServices.cpp.logdir 2012-10-10 07:08:46.000000000 +0100
-+++ hplip-3.12.10a/prnt/hpcups/SystemServices.cpp 2012-10-17 09:56:29.397578087 +0100
+diff -up hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.11/prnt/hpcups/SystemServices.cpp
+--- hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir 2012-11-20 10:49:20.000000000 +0100
++++ hplip-3.12.11/prnt/hpcups/SystemServices.cpp 2012-11-27 10:09:25.300698197 +0100
@@ -30,14 +30,17 @@
#include "CommonDefinitions.h"
@@ -151,9 +164,9 @@ diff -up hplip-3.12.10a/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.10a/prn
m_fp = fopen(fname, "w");
chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
}
-diff -up hplip-3.12.10a/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.10a/prnt/hpijs/hpcupsfax.cpp
---- hplip-3.12.10a/prnt/hpijs/hpcupsfax.cpp.logdir 2012-10-10 07:08:50.000000000 +0100
-+++ hplip-3.12.10a/prnt/hpijs/hpcupsfax.cpp 2012-10-17 09:56:29.397578087 +0100
+diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp
+--- hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir 2012-11-20 10:50:48.000000000 +0100
++++ hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp 2012-11-27 10:09:25.300698197 +0100
@@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE.
\*****************************************************************************/
@@ -202,9 +215,9 @@ diff -up hplip-3.12.10a/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.10a/prnt/hpij
fdFax = mkstemp (hpFileName);
if (fdFax < 0)
-diff -up hplip-3.12.10a/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.10a/prnt/hpijs/hpijs.cpp
---- hplip-3.12.10a/prnt/hpijs/hpijs.cpp.logdir 2012-10-17 09:56:29.390578050 +0100
-+++ hplip-3.12.10a/prnt/hpijs/hpijs.cpp 2012-10-17 09:56:29.398578093 +0100
+diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijs.cpp
+--- hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir 2012-11-27 10:09:25.288698537 +0100
++++ hplip-3.12.11/prnt/hpijs/hpijs.cpp 2012-11-27 10:09:25.301698169 +0100
@@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE.
\*****************************************************************************/
@@ -255,9 +268,9 @@ diff -up hplip-3.12.10a/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.10a/prnt/hpijs/hp
if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR)
BUG("unable to init capture");
#endif
-diff -up hplip-3.12.10a/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.10a/prnt/hpijs/hpijsfax.cpp
---- hplip-3.12.10a/prnt/hpijs/hpijsfax.cpp.logdir 2012-10-10 07:08:50.000000000 +0100
-+++ hplip-3.12.10a/prnt/hpijs/hpijsfax.cpp 2012-10-17 09:56:29.398578093 +0100
+diff -up hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijsfax.cpp
+--- hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir 2012-11-20 10:50:48.000000000 +0100
++++ hplip-3.12.11/prnt/hpijs/hpijsfax.cpp 2012-11-27 10:09:25.301698169 +0100
@@ -31,6 +31,7 @@
#ifdef HAVE_LIBHPIP
@@ -284,44 +297,3 @@ diff -up hplip-3.12.10a/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.10a/prnt/hpijs
pFaxStruct = new HPIJSFax ();
-diff -up hplip-3.12.10a/prnt/hpps/hppsfilter.c.logdir hplip-3.12.10a/prnt/hpps/hppsfilter.c
---- hplip-3.12.10a/prnt/hpps/hppsfilter.c.logdir 2012-10-17 10:00:07.937687485 +0100
-+++ hplip-3.12.10a/prnt/hpps/hppsfilter.c 2012-10-17 10:02:28.968378061 +0100
-@@ -48,13 +48,14 @@
- #define BOD_PJL "@PJL DMINFO ASCIIHEX=\"%s%s\"\012"
- #define BOD_DATETIME_FORMAT "%04d%02d%02d%02d%02d%02d"
- #define DBG_PSFILE "hpps_job"
--#define DBG_TMP_FOLDER "/var/log/hp/tmp/"
-
- #define LINE_SIZE 258
- #define FILE_NAME_SIZE 128
-
- #define SAVE_PS_FILE 2
-
-+static char *env_tmpdir;
-+
- /* save final output ps file: in cupsd.conf file value #hpLogLevel 15 */
- static int g_savepsfile = 0;
-
-@@ -94,7 +95,7 @@ void open_dbg_outfile(char* szjob_id)
- if (g_savepsfile & SAVE_PS_FILE)
- {
- char sfile_name[FILE_NAME_SIZE] = {0};
-- sprintf(sfile_name, "%s/%s_%d.out",DBG_TMP_FOLDER,DBG_PSFILE, szjob_id);
-+ sprintf(sfile_name, "%s/%s_%d.out",env_tmpdir,DBG_PSFILE, szjob_id);
- g_fp_outdbgps= fopen(sfile_name, "w");
- chmod(sfile_name, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
- }
-@@ -163,7 +164,11 @@ int main (int argc, char **argv)
- {
- cups_file_t *fp_input = NULL; /* input file: stdin or physical file */
- char line[LINE_SIZE] = {0};
--
-+
-+ env_tmpdir = getenv ("TMPDIR");
-+ if (!env_tmpdir)
-+ env_tmpdir = "/var/log/hp/tmp/";
-+
- get_LogLevel();
- setbuf (stderr, NULL);
- fprintf (stderr, "HP PS filter starting : %s \n", *argv);
diff --git a/hplip-makefile-chgrp.patch b/hplip-makefile-chgrp.patch
index 0ddfb2a..c366ba6 100644
--- a/hplip-makefile-chgrp.patch
+++ b/hplip-makefile-chgrp.patch
@@ -1,26 +1,26 @@
-diff -up hplip-3.12.9/Makefile.in.chgrp hplip-3.12.9/Makefile.in
---- hplip-3.12.9/Makefile.in.chgrp 2012-09-07 14:35:14.334691556 +0200
-+++ hplip-3.12.9/Makefile.in 2012-09-07 14:36:02.974988844 +0200
-@@ -8841,18 +8841,18 @@ uninstall-am: uninstall-binPROGRAMS unin
+diff -up hplip-3.12.11/Makefile.in.chgrp hplip-3.12.11/Makefile.in
+--- hplip-3.12.11/Makefile.in.chgrp 2012-11-27 11:40:02.000000000 +0100
++++ hplip-3.12.11/Makefile.in 2012-11-27 11:43:13.857379531 +0100
+@@ -8866,18 +8866,18 @@ uninstall-am: uninstall-binPROGRAMS unin
install-dist_hplip_LogDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
- at FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
- @FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
+ @FULL_BUILD_TRUE@ chmod 777 $(DESTDIR)$(hplip_Logdir)
@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
- at HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
- @HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
+ @HPLIP_BUILD_TRUE@ chmod 777 $(DESTDIR)$(hplip_Logdir)
install-dist_hplip_tmpDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
- at FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
- @FULL_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+ @FULL_BUILD_TRUE@ chmod 1777 $(DESTDIR)$(hplip_tmpdir)
@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
- at HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
- @HPLIP_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+ @HPLIP_BUILD_TRUE@ chmod 1777 $(DESTDIR)$(hplip_tmpdir)
install-dist_cronDATA:$(dist_cron_DATA)
diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch
index a83af06..8673d04 100644
--- a/hplip-snmp-quirks.patch
+++ b/hplip-snmp-quirks.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.12.6/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.12.6/prnt/drv/hpcups.drv.in
---- hplip-3.12.6/prnt/drv/hpcups.drv.in.snmp-quirks 2012-06-19 10:58:26.121167716 +0200
-+++ hplip-3.12.6/prnt/drv/hpcups.drv.in 2012-06-19 10:59:16.880473528 +0200
-@@ -6653,6 +6653,8 @@ Manufacturer "HP"
+diff -up hplip-3.12.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.12.11/prnt/drv/hpcups.drv.in
+--- hplip-3.12.11/prnt/drv/hpcups.drv.in.snmp-quirks 2012-11-27 10:08:06.958516241 +0100
++++ hplip-3.12.11/prnt/drv/hpcups.drv.in 2012-11-27 10:08:07.120513919 +0100
+@@ -6713,6 +6713,8 @@ Manufacturer "HP"
Attribute "NickName" "" "HP Officejet Pro 8500 a909a, $Version"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
@@ -10,7 +10,7 @@ diff -up hplip-3.12.6/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.12.6/prnt/drv/h
PCFileName "hp-officejet_pro_8500_a909a.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
}
-@@ -6669,6 +6671,8 @@ Manufacturer "HP"
+@@ -6729,6 +6731,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;"
diff --git a/hplip-systray-dbus-exception.patch b/hplip-systray-dbus-exception.patch
index 007fb0f..c21f26a 100644
--- a/hplip-systray-dbus-exception.patch
+++ b/hplip-systray-dbus-exception.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.11.10/ui4/systemtray.py.dbus-exception hplip-3.11.10/ui4/systemtray.py
---- hplip-3.11.10/ui4/systemtray.py.dbus-exception 2011-10-25 15:59:53.360181865 +0100
-+++ hplip-3.11.10/ui4/systemtray.py 2011-10-25 16:03:55.294815114 +0100
-@@ -707,7 +707,13 @@ def run(read_pipe):
+diff -up hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception hplip-3.12.11/ui4/systemtray.py
+--- hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception 2012-11-20 10:51:40.000000000 +0100
++++ hplip-3.12.11/ui4/systemtray.py 2012-11-27 10:08:51.333805871 +0100
+@@ -802,7 +802,13 @@ def run(read_pipe):
log.set_module("hp-systray(qt4)")
log.debug("PID=%d" % os.getpid())
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index d7e72cd..90c7c6f 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.12.6/data/rules/56-hpmud_support.rules.udev-rules hplip-3.12.6/data/rules/56-hpmud_support.rules
---- hplip-3.12.6/data/rules/56-hpmud_support.rules.udev-rules 2012-06-18 12:43:22.000000000 +0200
-+++ hplip-3.12.6/data/rules/56-hpmud_support.rules 2012-06-19 10:56:21.451872702 +0200
+diff -up hplip-3.12.11/data/rules/56-hpmud_support.rules.udev-rules hplip-3.12.11/data/rules/56-hpmud_support.rules
+--- hplip-3.12.11/data/rules/56-hpmud_support.rules.udev-rules 2012-11-20 10:53:51.000000000 +0100
++++ hplip-3.12.11/data/rules/56-hpmud_support.rules 2012-11-27 10:07:00.377519016 +0100
@@ -6,6 +6,7 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
LABEL="pid_test"
@@ -9,10 +9,10 @@ diff -up hplip-3.12.6/data/rules/56-hpmud_support.rules.udev-rules hplip-3.12.6/
# Check for LaserJet products (0x03f0xx17).
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
# Check for LaserJet products (0x03f0xx2a).
-diff -up hplip-3.12.6/Makefile.in.udev-rules hplip-3.12.6/Makefile.in
---- hplip-3.12.6/Makefile.in.udev-rules 2012-06-18 12:44:46.000000000 +0200
-+++ hplip-3.12.6/Makefile.in 2012-06-19 10:57:37.812828378 +0200
-@@ -4274,7 +4274,7 @@ cups_drv = prnt/drv/hpcups.drv
+diff -up hplip-3.12.11/Makefile.in.udev-rules hplip-3.12.11/Makefile.in
+--- hplip-3.12.11/Makefile.in.udev-rules 2012-11-20 10:55:50.000000000 +0100
++++ hplip-3.12.11/Makefile.in 2012-11-27 10:07:00.380518971 +0100
+@@ -4353,7 +4353,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE at dist_cron_DATA = data/rules/hplip_cron
# hpmud.rules
diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch
index d77b2c9..03c5794 100644
--- a/hplip-ui-optional.patch
+++ b/hplip-ui-optional.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.9.6b/base/utils.py.ui-optional hplip-3.9.6b/base/utils.py
---- hplip-3.9.6b/base/utils.py.ui-optional 2009-06-25 20:05:53.000000000 +0100
-+++ hplip-3.9.6b/base/utils.py 2009-07-28 10:10:57.984991878 +0100
-@@ -597,6 +597,13 @@ def checkPyQtImport(): # qt3
+diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
+--- hplip-3.12.11/base/utils.py.ui-optional 2012-11-20 10:55:15.000000000 +0100
++++ hplip-3.12.11/base/utils.py 2012-11-27 10:03:21.909512264 +0100
+@@ -667,6 +667,13 @@ def checkPyQtImport(): # qt3
if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
no_qt_message_gtk()
@@ -15,7 +15,7 @@ diff -up hplip-3.9.6b/base/utils.py.ui-optional hplip-3.9.6b/base/utils.py
log.error("PyQt not installed. GUI not available. Exiting.")
return False
-@@ -642,7 +649,10 @@ def checkPyQtImport(): # qt3
+@@ -712,7 +719,10 @@ def checkPyQtImport(): # qt3
def checkPyQtImport4():
try:
import PyQt4
diff --git a/hplip.spec b/hplip.spec
index 6d09bbd..c96e921 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,14 +1,12 @@
-%global posttag a
-
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.12.10
-Release: 4.%{posttag}%{?dist}
+Version: 3.12.11
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Url: http://hplip.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}%{posttag}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
Source1: hpcups-update-ppds.sh
Source2: copy-deviceids.py
Patch1: hplip-pstotiff-is-rubbish.patch
@@ -30,7 +28,6 @@ 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-release-parport.patch
Patch21: hplip-ppd-ImageableArea.patch
Patch22: hplip-raw_deviceID-traceback.patch
Patch23: hplip-UnicodeDecodeError.patch
@@ -138,7 +135,7 @@ Requires: %{name}-libs = %{version}-%{release}
SANE driver for scanners in HP's multi-function devices (from HPOJ).
%prep
-%setup -q -n hplip-%{version}%{posttag}
+%setup -q
# The pstotiff filter is rubbish so replace it (launchpad #528394).
%patch1 -p1 -b .pstotiff-is-rubbish
@@ -251,9 +248,6 @@ done
# Added missing newline to string argument in dbglog() call (bug #585275).
%patch19 -p1 -b .dbglog-newline
-# Release parport if unsupported model connected (bug #699052).
-%patch20 -p1 -b .release-parport
-
# Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4);
do
@@ -526,6 +520,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
+* Tue Nov 27 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.11-1
+- 3.12.11
+-- release-parport.patch merged upstream
+
* Wed Oct 17 2012 Tim Waugh <twaugh at redhat.com> 3.12.10-4.a
- Some more CUPS filters using the wrong temporary directory
(bug #865603).
diff --git a/sources b/sources
index 1d85aa0..63e5095 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f62ab4ceeb424a36b26f044d78a144bb hplip-3.12.10a.tar.gz
+6caadc4a9e49076c284b146e2dce2937 hplip-3.12.11.tar.gz
More information about the scm-commits
mailing list