Merge branch 'f13' into f14
This commit is contained in:
Jiri Popelka
commit
a0517a06ba
File diff suppressed because it is too large
Load Diff
@ -196,3 +196,311 @@ diff -up hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip
|
|||||||
*Product: "(HP LaserJet 4000 Series)"
|
*Product: "(HP LaserJet 4000 Series)"
|
||||||
*Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
|
*Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
|
||||||
*ModelName: "HP LaserJet 4000 Series"
|
*ModelName: "HP LaserJet 4000 Series"
|
||||||
|
diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd 2010-12-03 16:12:33.000000000 +0100
|
||||||
|
@@ -44,6 +44,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.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2010-12-03 16:12:11.000000000 +0100
|
||||||
|
@@ -44,6 +44,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.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2010-12-03 16:12:57.000000000 +0100
|
||||||
|
@@ -44,6 +44,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.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2010-12-03 16:13:58.000000000 +0100
|
||||||
|
@@ -43,6 +43,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.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd 2010-12-03 16:13:23.000000000 +0100
|
||||||
|
@@ -43,6 +43,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.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd 2010-12-03 16:14:24.000000000 +0100
|
||||||
|
@@ -43,6 +43,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.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd 2010-12-03 16:14:49.000000000 +0100
|
||||||
|
@@ -44,6 +44,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.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2010-12-03 16:15:10.000000000 +0100
|
||||||
|
@@ -44,6 +44,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.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd 2010-12-03 16:15:43.000000000 +0100
|
||||||
|
@@ -47,6 +47,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.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd 2010-12-03 16:16:06.000000000 +0100
|
||||||
|
@@ -49,6 +49,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.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd 2010-12-03 16:16:29.000000000 +0100
|
||||||
|
@@ -46,6 +46,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.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2010-12-03 16:17:23.000000000 +0100
|
||||||
|
@@ -49,6 +49,7 @@
|
||||||
|
*%== Mac OS X specific end ==
|
||||||
|
|
||||||
|
*% 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.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2010-12-03 16:16:55.000000000 +0100
|
||||||
|
@@ -51,6 +51,7 @@
|
||||||
|
*%== Mac OS X specific end ==
|
||||||
|
|
||||||
|
*% 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.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd 2010-12-03 16:04:48.000000000 +0100
|
||||||
|
@@ -56,6 +56,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.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd 2010-12-03 16:05:22.000000000 +0100
|
||||||
|
@@ -56,6 +56,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.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd 2010-12-03 16:05:51.000000000 +0100
|
||||||
|
@@ -60,6 +60,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.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:24:27.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd 2010-12-03 16:03:05.000000000 +0100
|
||||||
|
@@ -52,6 +52,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.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd 2010-12-03 16:03:27.000000000 +0100
|
||||||
|
@@ -51,6 +51,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.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd 2010-12-03 16:06:31.000000000 +0100
|
||||||
|
@@ -52,6 +52,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.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd 2010-12-03 16:07:07.000000000 +0100
|
||||||
|
@@ -52,6 +52,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.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd 2010-12-03 16:07:37.000000000 +0100
|
||||||
|
@@ -53,6 +53,7 @@
|
||||||
|
*HPPDEPanel: "HPImagingOptions"
|
||||||
|
|
||||||
|
*% 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.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd 2010-12-03 16:08:01.000000000 +0100
|
||||||
|
@@ -53,6 +53,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.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd 2010-12-03 16:08:28.000000000 +0100
|
||||||
|
@@ -55,6 +55,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.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd 2010-12-03 16:08:53.000000000 +0100
|
||||||
|
@@ -55,6 +55,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.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2010-12-03 16:10:19.000000000 +0100
|
||||||
|
@@ -56,6 +56,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.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2010-12-03 16:10:41.000000000 +0100
|
||||||
|
@@ -56,6 +56,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.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd 2010-12-03 16:11:04.000000000 +0100
|
||||||
|
@@ -57,6 +57,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.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd
|
||||||
|
--- hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100
|
||||||
|
+++ hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2010-12-03 16:11:32.000000000 +0100
|
||||||
|
@@ -51,6 +51,7 @@
|
||||||
|
*%== Mac OS X specific end ==
|
||||||
|
|
||||||
|
*% 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)"
|
||||||
|
|||||||
17
hplip.spec
17
hplip.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: HP Linux Imaging and Printing Project
|
Summary: HP Linux Imaging and Printing Project
|
||||||
Name: hplip
|
Name: hplip
|
||||||
Version: 3.10.9
|
Version: 3.10.9
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: GPLv2+ and MIT
|
License: GPLv2+ and MIT
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Conflicts: system-config-printer < 0.6.132
|
Conflicts: system-config-printer < 0.6.132
|
||||||
@ -154,6 +154,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
|||||||
# HP Color LaserJet 2840 (bug #582215).
|
# HP Color LaserJet 2840 (bug #582215).
|
||||||
# HP Color LaserJet CP1518ni (bug #613689).
|
# HP Color LaserJet CP1518ni (bug #613689).
|
||||||
# HP Color LaserJet 2600n (bug #613712).
|
# HP Color LaserJet 2600n (bug #613712).
|
||||||
|
# HP LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series
|
||||||
|
# P3005/P3010 Series/P4014/P4515 (bug #659039)
|
||||||
|
# HP Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n
|
||||||
|
# CP3525/CP4520 Series/CM2320nf/CM4730 MFP (bug #659040)
|
||||||
%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
|
||||||
@ -200,6 +204,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
|||||||
# HP Color LaserJet 2605dn (bug #583953).
|
# HP Color LaserJet 2605dn (bug #583953).
|
||||||
# HP Color LaserJet 3800 (bug #581935).
|
# HP Color LaserJet 3800 (bug #581935).
|
||||||
# HP Color LaserJet 2840 (bug #582215).
|
# HP Color LaserJet 2840 (bug #582215).
|
||||||
|
# HP LaserJet 4050 Series/4100 Series/2100 Series/2420/4200/4300/4350/5100 Series
|
||||||
|
# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039)
|
||||||
|
# HP Color LaserJet 2500/2550/2605dn/3700/4550/4600
|
||||||
|
# 4650/4700/5550/CP3525/CM4730 MFP (bug #659040)
|
||||||
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
|
||||||
@ -481,6 +489,13 @@ fi
|
|||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-7
|
||||||
|
- Corrected IEEE 1284 Device IDs:
|
||||||
|
HP LaserJet 4050/4100/2100 Series/2420/4200/4300/4350/5100/8000
|
||||||
|
M3027 MFP/M3035 MFP/P3005/P3010/P4014/P4515 (bug #659039).
|
||||||
|
HP Color LaserJet 2500/2550 series/3700/4550/4600/4650/4700/5550
|
||||||
|
CP1515n/CP3525/CP4520/CM2320nf MFP (bug #659040).
|
||||||
|
|
||||||
* Fri Nov 12 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-6
|
* Fri Nov 12 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-6
|
||||||
- Call cupsSetUser in cupsext's addPrinter method before connecting so
|
- Call cupsSetUser in cupsext's addPrinter method before connecting so
|
||||||
that we can get an authentication callback (bug #538352).
|
that we can get an authentication callback (bug #538352).
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user