rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

3.15.2

Browse Source
This commit is contained in:
Jiri Popelka 2015-02-04 19:21:42 +01:00
parent 5ebb10e16b
commit 6806ada431
15 changed files with 370 additions and 2395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -66,3 +66,4 @@ hplip-3.10.6.tar.gz
/hplip-3.14.4.tar.gz
/hplip-3.14.6.tar.gz
/hplip-3.14.10.tar.gz
/hplip-3.15.2.tar.gz

7
hplip-3.14.10.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlQzq2kACgkQc9dwzaWQR7kFZwCfVxHaORmTNA7jyexSGPKrXGoY
bWIAnjTK/xMAsx0un81KEWS/h2GFyB9V
=Vbpn
-----END PGP SIGNATURE-----

7
hplip-3.15.2.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlTKJoUACgkQc9dwzaWQR7nT8gCdEy8HVaJNSA5ajtXet7YAGs5H
6NwAoLVDro3CLYkLqnwHIDTzR+leQgdM
=qmEP
-----END PGP SIGNATURE-----

38
hplip-avahi-parsing.patch
View File

@ -1,19 +1,19 @@
diff -up hplip-3.14.6/base/avahi.py.avahi-parsing hplip-3.14.6/base/avahi.py
--- hplip-3.14.6/base/avahi.py.avahi-parsing 2014-06-17 14:42:57.557586402 +0100
+++ hplip-3.14.6/base/avahi.py 2014-06-17 14:45:56.104509934 +0100
@@ -59,9 +59,13 @@ def detectNetworkDevices(ttl=4, timeout=
'status_code': 0, 'device2': '0', 'device3': '0', 'note': ''}
y['ip'] = ip
y['hn'] = bits[6].replace('.local', '')
- details = bits[9].split('" "')
+ details = bits[9].rstrip ().strip ('"').split('" "')
for item in details:
- key, value = item.split('=', 1)
+ keyvalue = item.split('=', 1)
+ if len (keyvalue) < 2:
+ # Skip parts that don't match key=value
+ continue
+ key, value = keyvalue
if key == 'ty':
y['mdns'] = value
y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value
diff -up hplip-3.15.2/base/avahi.py.parsing hplip-3.15.2/base/avahi.py
--- hplip-3.15.2/base/avahi.py.parsing 2015-02-04 15:43:37.662551377 +0100
+++ hplip-3.15.2/base/avahi.py 2015-02-04 15:45:56.576564858 +0100
@@ -52,9 +52,14 @@ def detectNetworkDevices(ttl=4, timeout=
'status_code': 0, 'device2': '0', 'device3': '0', 'note': ''}
y['ip'] = ip
y['hn'] = bits[6].replace('.local', '')
- details = bits[9].split('" "')
+ details = bits[9].rstrip ().strip ('"').split('" "')
for item in details:
key, value = item.split('=', 1)
+ keyvalue = item.split('=', 1)
+ if len (keyvalue) < 2:
+ # Skip parts that don't match key=value
+ continue
+ key, value = keyvalue
if key == 'ty':
y['mdns'] = value
y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value

17
hplip-codec.patch
View File

@ -1,17 +0,0 @@
diff -up hplip-3.14.6/base/utils.py.codec hplip-3.14.6/base/utils.py
--- hplip-3.14.6/base/utils.py.codec 2014-07-09 10:35:11.813576899 +0100
+++ hplip-3.14.6/base/utils.py 2014-07-09 10:43:20.786495160 +0100
@@ -463,7 +463,12 @@ def sort_dict_by_value(d):
def commafy(val):
- return locale.format("%d", val, grouping=True).decode(locale.getpreferredencoding())
+ format = locale.format("%d", val, grouping=True)
+ encoding = locale.getlocale(locale.LC_NUMERIC)[1]
+ if encoding == None:
+ return format
+
+ return format.decode(encoding)
def format_bytes(s, show_bytes=False):

1488
hplip-deviceIDs-drv.patch
View File

File diff suppressed because it is too large Load Diff

594
hplip-deviceIDs-ppd.patch
View File

@ -1,597 +1,3 @@
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd 2013-07-23 12:41:46.653625035 +0200
@@ -42,6 +42,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 2500)"
*Product: "(Hewlett-Packard hp color LaserJet 2500)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2013-07-23 12:41:46.654625021 +0200
@@ -42,6 +42,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 2500)"
*Product: "(Hewlett-Packard hp color LaserJet 2500)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2013-07-23 12:41:46.655625007 +0200
@@ -42,6 +42,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2550 series;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 2550 series)"
*Product: "(Hewlett-Packard hp color LaserJet 2550 series)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2013-07-23 12:41:46.656624993 +0200
@@ -46,6 +46,7 @@
*% Product Name and Version Information
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;"
*Product: "(HP Color LaserJet 2605)"
*Product: "(Hewlett-Packard HP Color LaserJet 2605)"
*Product: "(HP Color LaserJet 2605dn)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd 2013-07-23 12:41:46.657624979 +0200
@@ -43,6 +43,7 @@
*% Product Name and Version Information
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;"
*Product: "(HP Color LaserJet 2820)"
*Product: "(Hewlett-Packard HP Color LaserJet 2820)"
*Product: "(HP Color LaserJet 2830)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2013-07-23 12:41:46.658624966 +0200
@@ -41,6 +41,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 3700)"
*Product: "(Hewlett-Packard hp color LaserJet 3700)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd 2013-07-23 12:41:46.659624952 +0200
@@ -41,6 +41,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 3700)"
*Product: "(Hewlett-Packard hp color LaserJet 3700)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd 2013-07-23 12:41:46.660624938 +0200
@@ -47,6 +47,7 @@
*% Product Name and Version Information
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;"
*Product: "(HP Color LaserJet 3800)"
*Product: "(Hewlett-Packard HP Color LaserJet 3800)"
*ModelName: "HP Color LaserJet 3800"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd 2013-07-23 12:41:46.661624924 +0200
@@ -40,6 +40,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet 4550 )"
*Product: "(Hewlett-Packard HP Color LaserJet 4550 )"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd 2013-07-23 12:41:46.662624910 +0200
@@ -41,6 +41,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 4600)"
*Product: "(Hewlett-Packard hp color LaserJet 4600)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2013-07-23 12:41:46.663624897 +0200
@@ -41,6 +41,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 4600)"
*Product: "(Hewlett-Packard hp color LaserJet 4600)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd 2013-07-23 12:41:46.664624883 +0200
@@ -43,6 +43,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 4650)"
*Product: "(Hewlett-Packard hp color LaserJet 4650)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd 2013-07-23 12:41:46.665624869 +0200
@@ -45,6 +45,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet 4700)"
*Product: "(Hewlett-Packard HP Color LaserJet 4700)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd 2013-07-23 12:41:46.666624855 +0200
@@ -43,6 +43,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;"
*Manufacturer: "HP"
*Product: "(hp color LaserJet 5550 )"
*Product: "(Hewlett-Packard hp color LaserJet 5550 )"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2013-07-23 12:41:46.667624841 +0200
@@ -44,6 +44,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet CM3530 MFP)"
*Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 12:46:53.884383444 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd 2013-07-23 12:43:46.000000000 +0200
@@ -32,6 +32,7 @@
*LanguageEncoding: ISOLatin1
*PCFileName: "HPP00004.PPD"
*Product: "(HP Color LaserJet CM4540 MFP)"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;"
*Manufacturer: "HP"
*ModelName: "HP Color LaserJet CM4540 MFP"
*ShortNickName: "HP Color LaserJet CM4540 MFP"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2013-07-23 12:41:46.668624828 +0200
@@ -43,6 +43,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet CM4730 MFP)"
*Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2013-07-23 12:41:46.670624800 +0200
@@ -44,6 +44,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet CP3525)"
*Product: "(Hewlett-Packard HP Color LaserJet CP3525)"
diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd 2013-07-23 12:45:48.252289396 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd 2013-07-23 12:44:34.000000000 +0200
@@ -44,6 +44,7 @@
*% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4005;"
*Manufacturer: "HP"
*Product: "(HP Color LaserJet CP4005)"
*Product: "(Hewlett-Packard HP Color LaserJet CP4005)"
diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd 2013-07-23 12:41:46.670624800 +0200
@@ -38,6 +38,7 @@
*ShortNickName: "HP Designjet T770 PostScript"
*NickName: "HP Designjet T770ps 44in Postscript (recommended)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;"
*% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism ===============
diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd 2013-07-23 12:41:46.671624786 +0200
@@ -38,6 +38,7 @@
*ShortNickName: "HP Designjet T770ps 24in"
*NickName: "HP Designjet T770ps 24in Postscript (recommended)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;"
*% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism ===============
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd 2013-07-23 12:41:46.671624786 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 1200)"
*Product: "(Hewlett-Packard HP LaserJet 1200)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd 2013-07-23 12:41:46.672624772 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 1200)"
*Product: "(Hewlett-Packard HP LaserJet 1200)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd 2013-07-23 12:41:46.673624759 +0200
@@ -58,6 +58,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1300n)"
*Product: "(HP LaserJet 1300n)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd 2013-07-23 12:41:46.673624759 +0200
@@ -58,6 +58,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1300n)"
*Product: "(HP LaserJet 1300n)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd 2013-07-23 12:41:46.674624745 +0200
@@ -58,6 +58,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1300n)"
*Product: "(HP LaserJet 1300n)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd 2013-07-23 12:41:46.675624731 +0200
@@ -55,6 +55,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd 2013-07-23 12:41:46.676624717 +0200
@@ -55,6 +55,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd 2013-07-23 12:41:46.677624703 +0200
@@ -55,6 +55,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd 2013-07-23 12:41:46.677624703 +0200
@@ -55,6 +55,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd 2013-07-23 12:41:46.678624689 +0200
@@ -55,6 +55,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd 2013-07-23 12:41:46.679624676 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 2100 Series)"
*Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
*PSVersion: "(2014.111) 1"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd 2013-07-23 12:41:46.680624662 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 2100 Series)"
*Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
*PSVersion: "(2014.111) 1"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd 2013-07-23 12:41:46.680624662 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 2200)"
*Product: "(Hewlett-Packard HP LaserJet 2200)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd 2013-07-23 12:41:46.681624648 +0200
@@ -54,6 +54,7 @@
*Product: "(HP LaserJet 2200)"
*Product: "(Hewlett-Packard HP LaserJet 2200)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd 2013-07-23 12:41:46.682624634 +0200
@@ -59,6 +59,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
*PSVersion: "(3010.107) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd 2013-07-23 12:41:46.683624620 +0200
@@ -59,6 +59,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
*PSVersion: "(3010.107) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd 2013-07-23 12:41:46.684624607 +0200
@@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2420)"
*Product: "(HP LaserJet 2420)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;"
*PSVersion: "(3010.107) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd 2013-07-23 12:41:46.684624607 +0200
@@ -58,6 +58,7 @@
*Product: "(HP LaserJet 3390)"
*Product: "(Hewlett-Packard HP LaserJet 3390)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd 2013-07-23 12:41:46.685624593 +0200
@@ -49,6 +49,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series"
*Product: "(HP LaserJet 4000 Series)"
*Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
*ModelName: "HP LaserJet 4000 Series"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd 2013-07-23 12:41:46.686624579 +0200
@@ -49,6 +49,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;"
*Product: "(HP LaserJet 4050 Series )"
*Product: "(Hewlett-Packard HP LaserJet 4050 Series )"
*Product: "(HP LaserJet 4050 Series)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd 2013-07-23 12:41:46.687624565 +0200
@@ -48,6 +48,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;"
*Product: "(HP LaserJet 4100 Series )"
*Product: "(Hewlett-Packard HP LaserJet 4100 Series )"
*Product: "(HP LaserJet 4100 Series)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd 2013-07-23 12:41:46.688624551 +0200
@@ -49,6 +49,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;"
*Product: "(hp LaserJet 4200)"
*Product: "(Hewlett-Packard hp LaserJet 4200)"
*Product: "(HP LaserJet 4200)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd 2013-07-23 12:41:46.689624538 +0200
@@ -50,6 +50,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;"
*Product: "(hp LaserJet 4250)"
*Product: "(Hewlett-Packard hp LaserJet 4250)"
*Product: "(HP LaserJet 4250)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd 2013-07-23 12:41:46.690624524 +0200
@@ -49,6 +49,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;"
*Product: "(hp LaserJet 4300)"
*Product: "(Hewlett-Packard hp LaserJet 4300)"
*Product: "(HP LaserJet 4300)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd 2013-07-23 12:41:46.691624510 +0200
@@ -50,6 +50,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;"
*Product: "(hp LaserJet 4350)"
*Product: "(Hewlett-Packard hp LaserJet 4350)"
*Product: "(HP LaserJet 4350)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd 2013-07-23 12:41:46.692624496 +0200
@@ -50,6 +50,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;"
*Product: "(HP LaserJet 5100 Series)"
*Product: "(Hewlett-Packard HP LaserJet 5100 Series)"
*ModelName: "HP LaserJet 5100 Series"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd 2013-07-23 12:41:46.694624469 +0200
@@ -52,6 +52,7 @@
*%=================================================
*% Product Version Information
*%=================================================
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;"
*ModelName: "HP LaserJet 8000 Series"
*ShortNickName: "HP LaserJet 8000 Series"
*NickName: "HP LaserJet 8000 Series Postscript (recommended)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd 2013-07-23 12:41:46.695624455 +0200
@@ -52,6 +52,7 @@
*%=================================================
*% Product Version Information
*%=================================================
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;"
*ModelName: "HP LaserJet 8000 Series"
*ShortNickName: "HP LaserJet 8000 Series"
*NickName: "HP LaserJet 8000 Series Postscript (recommended)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2013-07-23 12:41:46.696624441 +0200
@@ -51,6 +51,7 @@
*%=================================================
*% Product Version Information
*%=================================================
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;"
*ModelName: "HP LaserJet M3027 MFP"
*ShortNickName: "HP LaserJet M3027 MFP"
*NickName: "HP LaserJet M3027 MFP Postscript (recommended)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2013-07-23 12:41:46.697624427 +0200
@@ -52,6 +52,7 @@
*%=================================================
*% Product Version Information
*%=================================================
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;"
*ModelName: "HP LaserJet M3035 MFP"
*ShortNickName: "HP LaserJet M3035 MFP"
*NickName: "HP LaserJet M3035 MFP Postscript (recommended)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2013-07-23 12:41:46.698624413 +0200
@@ -58,6 +58,7 @@
*Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
*PSVersion: "(3010.107) 0"
*%=================================================
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd 2013-07-23 12:41:46.699624399 +0200
@@ -50,6 +50,7 @@
*%=================================================
*% Product Version Information
*%=================================================
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;"
*ModelName: "HP LaserJet P3005"
*ShortNickName: "HP LaserJet P3005"
*NickName: "HP LaserJet P3005 Postscript (recommended)"
diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd
--- hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2013-07-23 12:41:46.700624386 +0200
@@ -45,6 +45,7 @@
*% Product Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;"
*Product: "(HP LaserJet P3015)"
*Product: "(Hewlett-Packard HP LaserJet P3015)"
*Product: "(HP LaserJet P3011)"
diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd
--- hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid 2014-11-04 09:41:13.200005393 +0000
+++ hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd 2014-11-04 09:42:13.168312042 +0000

12
hplip-device_open.patch
View File

@ -1,12 +0,0 @@
diff -up hplip-3.14.10/base/device.py.device_open hplip-3.14.10/base/device.py
--- hplip-3.14.10/base/device.py.device_open 2014-10-31 09:28:43.675181974 +0000
+++ hplip-3.14.10/base/device.py 2014-10-31 09:28:56.579250180 +0000
@@ -400,7 +400,7 @@ def makeURI(param, port=1):
mq = queryModelByURI(d)
result_code, device_id = \
- hpmudext.device_open(d, mq.get('io-mode', hpmudext.HPMUD_UNI_MODE))
+ hpmudext.open_device(d, mq.get('io-mode', hpmudext.HPMUD_UNI_MODE))
if result_code == hpmudext.HPMUD_R_OK:
result_code, data = hpmudext.get_device_id(device_id)

419
hplip-jpeg.patch
View File

@ -1,419 +0,0 @@
diff -up hplip-3.14.10/prnt/hpijs/jdatadbf.c.jpeg hplip-3.14.10/prnt/hpijs/jdatadbf.c
--- hplip-3.14.10/prnt/hpijs/jdatadbf.c.jpeg 2014-10-07 09:56:31.000000000 +0100
+++ hplip-3.14.10/prnt/hpijs/jdatadbf.c 2014-10-31 14:52:08.236306644 +0000
@@ -24,7 +24,7 @@ typedef struct {
JOCTET * outbuff; // target output buffer
JOCTET * buffer; // start of internal buffer
UINT16 size_outbuff; // current size of target output buffer
- JMETHOD (void, flush_output_buffer_callback, (JOCTET *outbuf, JOCTET* buffer, size_t size));
+ void (* flush_output_buffer_callback) (JOCTET *outbuf, JOCTET* buffer, size_t size);
} my_destination_mgr;
typedef my_destination_mgr * my_dest_ptr;
diff -up hplip-3.14.10/prnt/hpijs/jpegint.h.jpeg hplip-3.14.10/prnt/hpijs/jpegint.h
--- hplip-3.14.10/prnt/hpijs/jpegint.h.jpeg 2014-10-07 09:56:31.000000000 +0100
+++ hplip-3.14.10/prnt/hpijs/jpegint.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,392 +0,0 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum { /* Operating modes for buffer controllers */
- JBUF_PASS_THRU, /* Plain stripwise operation */
- /* Remaining modes require a full-image buffer to have been created */
- JBUF_SAVE_SOURCE, /* Run source subobject only, save output */
- JBUF_CRANK_DEST, /* Run dest subobject only, using saved data */
- JBUF_SAVE_AND_PASS /* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START 100 /* after create_compress */
-#define CSTATE_SCANNING 101 /* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK 102 /* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS 103 /* jpeg_write_coefficients done */
-#define DSTATE_START 200 /* after create_decompress */
-#define DSTATE_INHEADER 201 /* reading header markers, no SOS yet */
-#define DSTATE_READY 202 /* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD 203 /* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN 204 /* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING 205 /* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK 206 /* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE 207 /* expecting jpeg_start_output */
-#define DSTATE_BUFPOST 208 /* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS 209 /* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING 210 /* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
- JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
- JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
- JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
- /* State variables made visible to other modules */
- boolean call_pass_startup; /* True if pass_startup must be called */
- boolean is_last_pass; /* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
- JMETHOD(void, process_data, (j_compress_ptr cinfo,
- JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
- JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- JSAMPARRAY input_buf,
- JDIMENSION *in_row_ctr,
- JDIMENSION in_rows_avail,
- JSAMPIMAGE output_buf,
- JDIMENSION *out_row_group_ctr,
- JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
- JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo));
- JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo));
- JMETHOD(void, downsample, (j_compress_ptr cinfo,
- JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- JSAMPIMAGE output_buf,
- JDIMENSION out_row_group_index));
-
- boolean need_context_rows; /* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-struct jpeg_forward_dct {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo));
- /* perhaps this should be an array??? */
- JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- jpeg_component_info * compptr,
- JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- JDIMENSION start_row, JDIMENSION start_col,
- JDIMENSION num_blocks));
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
- JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
- JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
- JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
- JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
- JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
- JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
- JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
- /* These routines are exported to allow insertion of extra markers */
- /* Probably only COM and APPn markers should be written this way */
- JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- unsigned int datalen));
- JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
- JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
- JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
- /* State variables made visible to other modules */
- boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
- JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
- JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
- JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
- JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
- /* State variables made visible to other modules */
- boolean has_multiple_scans; /* True if file has multiple scans */
- boolean eoi_reached; /* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
- JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
- JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
- JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
- JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
- JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- JSAMPIMAGE output_buf));
- /* Pointer to array of coefficient virtual arrays, or NULL if none */
- jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
- JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- JSAMPIMAGE input_buf,
- JDIMENSION *in_row_group_ctr,
- JDIMENSION in_row_groups_avail,
- JSAMPARRAY output_buf,
- JDIMENSION *out_row_ctr,
- JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
- JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
- /* Read markers until SOS or EOI.
- * Returns same codes as are defined for jpeg_consume_input:
- * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
- */
- JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
- /* Read a restart marker --- exported for use by entropy decoder only */
- jpeg_marker_parser_method read_restart_marker;
-
- /* State of marker reader --- nominally internal, but applications
- * supplying COM or APPn handlers might like to know the state.
- */
- boolean saw_SOI; /* found SOI? */
- boolean saw_SOF; /* found SOF? */
- int next_restart_num; /* next restart number expected (0-7) */
- unsigned int discarded_bytes; /* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
- JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- JBLOCKROW *MCU_data));
-
- /* This is here to share code between baseline and progressive decoders; */
- /* other modules probably should not use it */
- boolean insufficient_data; /* set TRUE after emitting warning */
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
- (j_decompress_ptr cinfo, jpeg_component_info * compptr,
- JCOEFPTR coef_block,
- JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
- /* It is useful to allow each component to have a separate IDCT method. */
- inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
- JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- JSAMPIMAGE input_buf,
- JDIMENSION *in_row_group_ctr,
- JDIMENSION in_row_groups_avail,
- JSAMPARRAY output_buf,
- JDIMENSION *out_row_ctr,
- JDIMENSION out_rows_avail));
-
- boolean need_context_rows; /* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
- JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- JSAMPIMAGE input_buf, JDIMENSION input_row,
- JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
- JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- int num_rows));
- JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
- JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity. This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit. But some
- * C compilers implement >> with an unsigned shift. For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts. SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft) \
- ((shift_temp = (x)) < 0 ? \
- (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
- (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft) ((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master jICompress
-#define jinit_c_master_control jICMaster
-#define jinit_c_main_controller jICMainC
-#define jinit_c_prep_controller jICPrepC
-#define jinit_c_coef_controller jICCoefC
-#define jinit_color_converter jICColor
-#define jinit_downsampler jIDownsampler
-#define jinit_forward_dct jIFDCT
-#define jinit_huff_encoder jIHEncoder
-#define jinit_phuff_encoder jIPHEncoder
-#define jinit_marker_writer jIMWriter
-#define jinit_master_decompress jIDMaster
-#define jinit_d_main_controller jIDMainC
-#define jinit_d_coef_controller jIDCoefC
-#define jinit_d_post_controller jIDPostC
-#define jinit_input_controller jIInCtlr
-#define jinit_marker_reader jIMReader
-#define jinit_huff_decoder jIHDecoder
-#define jinit_phuff_decoder jIPHDecoder
-#define jinit_inverse_dct jIIDCT
-#define jinit_upsampler jIUpsampler
-#define jinit_color_deconverter jIDColor
-#define jinit_1pass_quantizer jI1Quant
-#define jinit_2pass_quantizer jI2Quant
-#define jinit_merged_upsampler jIMUpsampler
-#define jinit_memory_mgr jIMemMgr
-#define jdiv_round_up jDivRound
-#define jround_up jRound
-#define jcopy_sample_rows jCopySamples
-#define jcopy_block_row jCopyBlocks
-#define jzero_far jZeroFar
-#define jpeg_zigzag_order jZIGTable
-#define jpeg_natural_order jZAGTable
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
- boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
- boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
- boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
- boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
- boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
- boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
- boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
- JSAMPARRAY output_array, int dest_row,
- int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
- JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0 /* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER /* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */
--- hplip-3.14.10/prnt/hpcups/jdatadbf.c.jpeg 2014-10-31 15:12:04.567605759 +0000
+++ hplip-3.14.10/prnt/hpcups/jdatadbf.c 2014-10-31 15:12:08.254625172 +0000
@@ -23,7 +23,7 @@ typedef struct {
JOCTET * outbuff; // target output buffer
JOCTET * buffer; // start of internal buffer
UINT16 size_outbuff; // current size of target output buffer
- JMETHOD (void, flush_output_buffer_callback, (JOCTET *outbuf, JOCTET* buffer, size_t size));
+ void (* flush_output_buffer_callback) (JOCTET *outbuf, JOCTET* buffer, size_t size);
} my_destination_mgr;
typedef my_destination_mgr * my_dest_ptr;

18
hplip-log-stderr.patch
View File

@ -1,7 +1,7 @@
diff -up hplip-3.14.4/fax/backend/hpfax.py.log hplip-3.14.4/fax/backend/hpfax.py
--- hplip-3.14.4/fax/backend/hpfax.py.log 2014-04-04 12:42:15.000000000 +0200
+++ hplip-3.14.4/fax/backend/hpfax.py 2014-05-22 11:39:06.917683733 +0200
@@ -52,7 +52,10 @@ home_dir = ''
diff -up hplip-3.15.2/fax/backend/hpfax.py.log-stderr hplip-3.15.2/fax/backend/hpfax.py
--- hplip-3.15.2/fax/backend/hpfax.py.log-stderr 2015-01-29 13:20:35.000000000 +0100
+++ hplip-3.15.2/fax/backend/hpfax.py 2015-02-04 15:40:48.360972449 +0100
@@ -55,7 +55,10 @@ home_dir = ''
def bug(msg):
syslog.syslog("hpfax[%d]: error: %s\n" % (pid, msg))
@ -13,10 +13,10 @@ diff -up hplip-3.14.4/fax/backend/hpfax.py.log hplip-3.14.4/fax/backend/hpfax.py
if os.path.exists(config_file):
diff -up hplip-3.14.4/prnt/filters/hpps.log hplip-3.14.4/prnt/filters/hpps
--- hplip-3.14.4/prnt/filters/hpps.log 2014-04-04 12:39:47.000000000 +0200
+++ hplip-3.14.4/prnt/filters/hpps 2014-05-22 11:38:30.620187178 +0200
@@ -49,10 +49,16 @@ home_dir = ''
diff -up hplip-3.15.2/prnt/filters/hpps.log-stderr hplip-3.15.2/prnt/filters/hpps
--- hplip-3.15.2/prnt/filters/hpps.log-stderr 2015-02-04 15:40:48.360972449 +0100
+++ hplip-3.15.2/prnt/filters/hpps 2015-02-04 15:43:14.796878364 +0100
@@ -53,10 +53,16 @@ home_dir = ''
def bug(m):
@ -34,4 +34,4 @@ diff -up hplip-3.14.4/prnt/filters/hpps.log hplip-3.14.4/prnt/filters/hpps
+ sys.stderr.write("INFO: %s\n" % msg)
if os.path.exists(config_file):
config = ConfigParser.ConfigParser()
config = configparser.ConfigParser()

16
hplip-logdir.patch
View File

@ -1,7 +1,7 @@
diff -up hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir 2014-06-05 13:33:05.426719552 +0200
+++ hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp 2014-06-05 13:33:05.432719467 +0200
@@ -604,7 +604,7 @@ int HPCupsFilter::processRasterData(cups
diff -up hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2015-02-04 14:22:43.838774401 +0100
+++ hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp 2015-02-04 14:22:43.844774315 +0100
@@ -619,7 +619,7 @@ int HPCupsFilter::processRasterData(cups
char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages.
@ -10,15 +10,15 @@ diff -up hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.6/prnt/hpcu
while (cupsRasterReadHeader2(cups_raster, &cups_header))
diff -up hplip-3.14.6/prnt/hpcups/SystemServices.cpp.logdir hplip-3.14.6/prnt/hpcups/SystemServices.cpp
--- hplip-3.14.6/prnt/hpcups/SystemServices.cpp.logdir 2014-06-05 13:33:05.432719467 +0200
+++ hplip-3.14.6/prnt/hpcups/SystemServices.cpp 2014-06-05 13:34:05.742861168 +0200
diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hpcups/SystemServices.cpp
--- hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir 2015-02-04 14:22:43.844774315 +0100
+++ hplip-3.15.2/prnt/hpcups/SystemServices.cpp 2015-02-04 14:24:04.080626127 +0100
@@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL
if (iLogLevel & SAVE_OUT_FILE)
{
char fname[MAX_FILE_PATH_LEN];
- sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
+ snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
createTempFile(fname, &m_fp);
if (m_fp)
{

15
hplip-pstotiff-is-rubbish.patch
View File

@ -1,7 +1,7 @@
diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/filters/pstotiff
--- hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish 2011-07-24 21:06:43.000000000 +0200
+++ hplip-3.11.7/fax/filters/pstotiff 2011-07-25 13:42:27.776988201 +0200
@@ -1,40 +1,16 @@
diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/filters/pstotiff
--- hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish 2015-02-04 09:40:43.169147058 +0100
+++ hplip-3.15.2/fax/filters/pstotiff 2015-02-04 09:47:20.786983832 +0100
@@ -1,45 +1,16 @@
-#!/usr/bin/env python
-
-import os
@ -10,6 +10,8 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/
-import sys
-import tempfile
-
-PY3 = sys.version_info[0] == 3
-
-READ_SIZE = 8192
-
-total_bytes_read = 0
@ -36,7 +38,10 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/
-out_handle = open(temp_out_fname, mode='rb')
-while (total_bytes_read < file_len):
- data = out_handle.read(READ_SIZE)
- sys.stdout.write(data)
- if PY3:
- sys.stdout.buffer.write(data)
- else:
- sys.stdout.write(data)
- total_bytes_read += READ_SIZE
-out_handle.close()
-

18
hplip-scan-tmp.patch
View File

@ -1,7 +1,7 @@
diff -up hplip-3.14.4/scan.py.scan-tmp hplip-3.14.4/scan.py
--- hplip-3.14.4/scan.py.scan-tmp 2014-04-04 11:42:20.000000000 +0100
+++ hplip-3.14.4/scan.py 2014-04-29 17:20:05.653622531 +0100
@@ -1072,7 +1072,7 @@ try:
diff -up hplip-3.15.2/scan.py.scan-tmp hplip-3.15.2/scan.py
--- hplip-3.15.2/scan.py.scan-tmp 2015-02-04 15:27:20.423562999 +0100
+++ hplip-3.15.2/scan.py 2015-02-04 15:34:59.170978476 +0100
@@ -1080,7 +1080,7 @@ try:
if ('editor' in dest or 'viewer' in dest or 'email' in dest or 'print' in dest) \
and not file_saved:
@ -9,11 +9,11 @@ diff -up hplip-3.14.4/scan.py.scan-tmp hplip-3.14.4/scan.py
+ output_fd, output = utils.make_temp_file(dir='/var/tmp', suffix='.png')
try:
im.save(output)
except IOError, e:
diff -up hplip-3.14.4/scan/sane.py.scan-tmp hplip-3.14.4/scan/sane.py
--- hplip-3.14.4/scan/sane.py.scan-tmp 2014-04-04 11:41:13.000000000 +0100
+++ hplip-3.14.4/scan/sane.py 2014-04-29 17:21:34.663061497 +0100
@@ -424,7 +424,8 @@ class ScanThread(threading.Thread):
except IOError as e:
diff -up hplip-3.15.2/scan/sane.py.scan-tmp hplip-3.15.2/scan/sane.py
--- hplip-3.15.2/scan/sane.py.scan-tmp 2015-01-29 13:20:21.000000000 +0100
+++ hplip-3.15.2/scan/sane.py 2015-02-04 15:27:20.424562984 +0100
@@ -425,7 +425,8 @@ class ScanThread(threading.Thread):
self.dev = device
self.update_queue = update_queue
self.event_queue = event_queue

113
hplip.spec
View File

@ -1,13 +1,13 @@
# we don't want to provide private python extension libs
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so$
%filter_provides_in %{python3_sitearch}/.*\.so$
%filter_setup
}
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.14.10
Release: 8%{?dist}
Version: 3.15.2
Release: 1%{?dist}
License: GPLv2+ and MIT
Url: http://hplip.sourceforge.net/
@ -30,27 +30,24 @@ Patch13: hplip-bad-low-ink-warning.patch
Patch14: hplip-deviceIDs-ppd.patch
Patch15: hplip-ppd-ImageableArea.patch
Patch16: hplip-scan-tmp.patch
Patch17: hplip-codec.patch
Patch18: hplip-log-stderr.patch
Patch19: hplip-avahi-parsing.patch
Patch20: hplip-reportlab.patch
Patch21: hplip-device_open.patch
Patch22: hplip-jpeg.patch
Patch23: hplip-dj990c-margin.patch
Patch24: hplip-strncpy.patch
Patch17: hplip-log-stderr.patch
Patch18: hplip-avahi-parsing.patch
Patch19: hplip-reportlab.patch
Patch20: hplip-dj990c-margin.patch
Patch21: hplip-strncpy.patch
%global hpijs_epoch 1
Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python-imaging
Requires: python3-pillow
Requires: cups
Requires: wget
Requires: dbus-python
Requires: python3-dbus
Requires: gnupg
BuildRequires: net-snmp-devel
BuildRequires: cups-devel
BuildRequires: python2-devel
BuildRequires: python3-devel
BuildRequires: libjpeg-devel
BuildRequires: desktop-file-utils
BuildRequires: libusb1-devel
@ -83,7 +80,7 @@ Summary: HPLIP libraries
Group: System Environment/Libraries
License: GPLv2+ and MIT
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: python
Requires: python3
%description libs
Libraries needed by HPLIP.
@ -93,8 +90,9 @@ Summary: HPLIP graphical tools
Group: Applications/System
License: BSD
Requires: PyQt4
Requires: python-reportlab
Requires: pygobject2
Requires: python3-reportlab
# hpssd.py
Requires: python3-gobject
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libsane-hpaio%{?_isa} = %{version}-%{release}
@ -143,33 +141,8 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
%patch4 -p1 -b .no-asm
# Corrected several IEEE 1284 Device IDs using foomatic data.
# Color LaserJet CM1312nfi (bug #581005)
# Color LaserJet 3800 (bug #581935)
# Color LaserJet 2840 (bug #582215)
# Color LaserJet CP1518ni (bug #613689)
# Color LaserJet 2600n (bug #613712)
# Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n
# CP3525/CP4520 Series/CM2320nf (bug #659040)
# Color LaserJet CP2025dn (bug #651509)
# Color LaserJet CM4730 MFP (bug #658831)
# Color LaserJet CM3530 MFP (bug #659381)
# LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series
# P3005/P3010 Series/P4014/P4515 (bug #659039)
# LaserJet Professional P1606dn (bug #708472)
# LaserJet Professional M1212nf MFP (bug #742490)
# LaserJet M1536dnf MFP (bug #743915)
# LaserJet M1522nf MFP (bug #745498)
# LaserJet M1319f MFP (bug #746614)
# LaserJet M1120 MFP (bug #754139)
# LaserJet P1007 (bug #585272)
# LaserJet P1505 (bug #680951)
# LaserJet P2035 (Ubuntu #917703)
# PSC 1600 series (bug #743821)
# Officejet 6300 series (bug #689378)
# LaserJet Professional P1102w (bug #795958)
# Color LaserJet CM4540 MFP (bug #968177)
# Color LaserJet cp4005 (bug #980976)
# HP LaserJet Professional M1132 MFP (bug #1158743)
# Color LaserJet 2500 series (bug #659040)
# LaserJet 4100 Series/2100 Series (bug #659039)
%patch5 -p1 -b .deviceIDs-drv
chmod +x %{SOURCE2}
mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
@ -203,23 +176,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
%patch13 -p1 -b .bad-low-ink-warning
# Add Device ID for
# LaserJet 1200 (bug #577308)
# LaserJet 1320 series (bug #579920)
# LaserJet 2300 (bug #576928)
# LaserJet P2015 Series (bug #580231)
# LaserJet 4250 (bug #585499)
# Color LaserJet 2605dn (bug #583953)
# Color LaserJet 3800 (bug #581935)
# Color LaserJet 2840 (bug #582215)
# LaserJet 4050 Series/4100 Series/2100 Series/2420/4200/4300/4350/5100 Series
# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039)
# Color LaserJet 2500/2550/2605dn/3700/4550/4600
# 4650/4700/5550/CP3525 (bug #659040)
# Color LaserJet CM4730 MFP (bug #658831)
# Color LaserJet CM3530 MFP (bug #659381)
# Designjet T770 (bug #747957)
# Color LaserJet CM4540 MFP (bug #968177)
# Color LaserJet cp4005 (bug #980976)
# HP LaserJet Color M451dn (bug #1159380)
for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4);
do
@ -245,39 +201,29 @@ done
# Scan to /var/tmp instead of /tmp (bug #1076954).
%patch16 -p1 -b .scan-tmp
# Fixed codec issue (bug #984167).
%patch17 -p1 -b .codec
# Treat logging before importing of logger module (bug #984699).
%patch18 -p1 -b .log-stderr
%patch17 -p1 -b .log-stderr
# Fix parsing of avahi-daemon output (bug #1096939).
%patch19 -p1 -b .parsing
%patch18 -p1 -b .parsing
# Fixed version comparisons for x.y.z-style versions such as
# reportlab (bug #1121433).
%patch20 -p1 -b .reportlab
# Fixed incorrect name in function call in makeURI when a parallel
# port device is used (bug #1159161).
%patch21 -p1 -b .device_open
# Fixed build against libjpeg-turbo 1.3.90.
%patch22 -p1 -b .jpeg
%patch19 -p1 -b .reportlab
# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
%patch23 -p1 -b .dj990c-margin
%patch20 -p1 -b .dj990c-margin
# Fixed uses of strncpy throughout.
%patch24 -p1 -b .strncpy
%patch21 -p1 -b .strncpy
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351).
# Change shebang /usr/bin/env python -> /usr/bin/python3 (bug #618351).
find -name '*.py' -print0 | xargs -0 \
sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python,'
sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},'
%build
%configure \
@ -286,7 +232,7 @@ find -name '*.py' -print0 | xargs -0 \
--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
--enable-foomatic-drv-install \
--enable-hpijs-install \
--disable-policykit --with-mimedir=%{_datadir}/cups/mime
--disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python3}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -295,7 +241,7 @@ make
%install
mkdir -p %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}
make install DESTDIR=%{buildroot} PYTHON=%{__python3}
# Create /run/hplip
mkdir -p %{buildroot}/run/hplip
@ -319,7 +265,7 @@ rm -rf %{buildroot}%{_sysconfdir}/sane.d \
rm -f %{buildroot}%{_bindir}/foomatic-rip \
%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
%{buildroot}%{_libdir}/*.la \
%{buildroot}%{python_sitearch}/*.la \
%{buildroot}%{python3_sitearch}/*.la \
%{buildroot}%{_libdir}/libhpip.so \
%{buildroot}%{_libdir}/sane/*.la \
%{buildroot}%{_datadir}/cups/model/foomatic-ppds \
@ -465,7 +411,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
# The so symlink is required here (see bug #489059).
%{_libdir}/libhpmud.so*
# Python extension
%{python_sitearch}/*
%{python3_sitearch}/*
%files gui
%{_bindir}/hp-check
@ -506,6 +452,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Wed Feb 04 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.2-1
- 3.15.2
* Wed Jan 21 2015 Tim Waugh <twaugh@redhat.com> - 3.14.10-8
- No need to remove hpcac as it is no longer provided upstream.

2
sources
View File

@ -1 +1 @@
7af44ee1c4312b00d2269c1b25008f73 hplip-3.14.10.tar.gz
bbc55fc0d45e130a24ab042f60f9f888 hplip-3.15.2.tar.gz