- Added/corrected more IEEE 1284 Device IDs:

- HP Color LaserJet CM1312nfi (bug #581005).
- HP Color LaserJet 3800 (bug #581935).
- HP Color LaserJet 2840 (bug #582215).
- HP PSC 2400 (bug #583103).
This commit is contained in:
Tim Waugh 2010-04-16 21:36:23 +00:00
parent 3b6c38c8e3
commit c067ce7b06
3 changed files with 70 additions and 30 deletions

View File

@ -1,6 +1,6 @@
diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in
--- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-25 00:09:42.000000000 +0100 --- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-24 23:09:42.000000000 +0000
+++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-09 11:09:10.000000000 +0200 +++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-16 22:20:26.664147525 +0100
@@ -421,7 +421,7 @@ Manufacturer "HP" @@ -421,7 +421,7 @@ Manufacturer "HP"
ModelName "HP Officejet v40xi" ModelName "HP Officejet v40xi"
Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "NickName" "" "HP Officejet v40xi, $Version"
@ -918,6 +918,15 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv
PCFileName "hp-laserjet_8150_series-pcl3.ppd" PCFileName "hp-laserjet_8150_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150 Printer)"
Attribute "Product" "" "(HP LaserJet 8150n Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)"
@@ -10174,7 +10175,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Color LaserJet cm1312nfi MFP"
Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;"
PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)"
}
@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies" @@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Business Inkjet 2300" ModelName "HP Business Inkjet 2300"
Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version"
@ -932,7 +941,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv
Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version"
Attribute "ShortNickName" "" "HP Color LaserJet 3800" Attribute "ShortNickName" "" "HP Color LaserJet 3800"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;"
+ Attribute "1284DeviceID" "" "MFG:HP;MDL:HP Color LaserJet 3800;DES:HP Color LaserJet 3800;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;"
PCFileName "hp-color_laserjet_3800-pcl3.ppd" PCFileName "hp-color_laserjet_3800-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"

View File

@ -1,6 +1,28 @@
diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2010-04-16 22:24:03.049147700 +0100
+++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd 2010-04-16 22:25:34.077147648 +0100
@@ -46,6 +46,7 @@
*% Product Name and Version Information
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;"
*Product: "(HP Color LaserJet 2820)"
*Product: "(Hewlett-Packard HP Color LaserJet 2820)"
*Product: "(HP Color LaserJet 2830)"
diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2010-04-16 22:22:28.705273898 +0100
+++ hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd 2010-04-16 22:23:28.914273477 +0100
@@ -51,6 +51,7 @@
*% Product Name and Version Information
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;"
*Product: "(HP Color LaserJet 3800)"
*Product: "(Hewlett-Packard HP Color LaserJet 3800)"
*ModelName: "HP Color LaserJet 3800"
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:01.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-01 15:41:31.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-16 22:21:49.286273004 +0100
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
*Product: "(HP LaserJet 1200)" *Product: "(HP LaserJet 1200)"
*Product: "(Hewlett-Packard HP LaserJet 1200)" *Product: "(Hewlett-Packard HP LaserJet 1200)"
@ -10,8 +32,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:11.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-01 15:40:52.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-16 22:21:49.292272590 +0100
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
*Product: "(HP LaserJet 1200)" *Product: "(HP LaserJet 1200)"
*Product: "(Hewlett-Packard HP LaserJet 1200)" *Product: "(Hewlett-Packard HP LaserJet 1200)"
@ -21,8 +43,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-08 17:44:22.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-16 22:21:49.300272653 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)"
@ -32,8 +54,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-08 17:44:38.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-16 22:21:49.304148148 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)"
@ -43,8 +65,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-08 17:44:43.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-16 22:21:49.317273026 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)"
@ -54,8 +76,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-08 17:44:48.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-16 22:21:49.321272466 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)"
@ -65,8 +87,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-08 17:44:53.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-16 22:21:49.334278100 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
*Product: "(HP LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)"
@ -76,8 +98,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:23.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-01 15:39:35.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-16 22:21:49.342272544 +0100
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)" *Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)" *Product: "(HP LaserJet 2300L)"
@ -87,8 +109,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:36.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-01 15:39:58.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-16 22:21:49.346272524 +0100
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
*Product: "(Hewlett-Packard hp LaserJet 2300L)" *Product: "(Hewlett-Packard hp LaserJet 2300L)"
*Product: "(HP LaserJet 2300L)" *Product: "(HP LaserJet 2300L)"
@ -98,8 +120,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-08 17:45:10.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-16 22:21:49.356149235 +0100
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)" *Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@ -109,8 +131,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hp
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-08 17:45:15.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-16 22:21:49.367148274 +0100
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)" *Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@ -120,8 +142,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hpl
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-08 17:45:19.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-16 22:21:49.376148194 +0100
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)" *Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@ -131,8 +153,8 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hpli
*%================================================= *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 --- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-08 17:45:25.000000000 +0200 +++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-16 22:21:49.386147840 +0100
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
*Product: "(HP LaserJet P2015 Series)" *Product: "(HP LaserJet P2015 Series)"
*Product: "(Hewlett-Packard HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"

View File

@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%patch4 -p1 -b .no-asm %patch4 -p1 -b .no-asm
# Corrected several IEEE 1284 Device IDs using foomatic data. # Corrected several IEEE 1284 Device IDs using foomatic data.
# HP Color LaserJet CM1312nfi (bug #581005).
# HP Color LaserJet 3800 (bug #581935).
# HP Color LaserJet 2840 (bug #582215).
%patch5 -p1 -b .deviceIDs-drv %patch5 -p1 -b .deviceIDs-drv
# Stopped hpcups pointlessly trying to read spool files # Stopped hpcups pointlessly trying to read spool files
@ -167,6 +170,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# HP LaserJet 1320 series (bug #579920) # HP LaserJet 1320 series (bug #579920)
# HP LaserJet 2300 (bug #576928) # HP LaserJet 2300 (bug #576928)
# HP LaserJet P2015 Series (bug #580231) # HP LaserJet P2015 Series (bug #580231)
# HP Color LaserJet 3800 (bug #581935).
# HP Color LaserJet 2840 (bug #582215).
for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
do do
gunzip ${ppd_file#*/}.gz gunzip ${ppd_file#*/}.gz
@ -402,7 +407,11 @@ fi
%changelog %changelog
* Fri Apr 16 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-11 * Fri Apr 16 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-11
- Corrected IEEE 1284 Device ID for HP PSC 2400 (bug #583103). - Added/corrected more IEEE 1284 Device IDs:
- HP Color LaserJet CM1312nfi (bug #581005).
- HP Color LaserJet 3800 (bug #581935).
- HP Color LaserJet 2840 (bug #582215).
- HP PSC 2400 (bug #583103).
* Thu Apr 16 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-10 * Thu Apr 16 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-10
- Fixed black/blank lines in ljcolor hpcups output (bug #579461). - Fixed black/blank lines in ljcolor hpcups output (bug #579461).