diff --git a/hplip-device-ids.patch b/hplip-deviceIDs-drv.patch similarity index 85% rename from hplip-device-ids.patch rename to hplip-deviceIDs-drv.patch index bfe09f7..c903dcb 100644 --- a/hplip-device-ids.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hpcups.drv.in ---- hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids 2010-02-20 11:18:12.473921525 +0000 -+++ hplip-3.9.12/prnt/drv/hpcups.drv.in 2010-02-20 14:44:58.326282207 +0000 -@@ -401,7 +401,7 @@ Manufacturer "HP" +diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in +--- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-25 00:09:42.000000000 +0100 ++++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-09 11:09:10.000000000 +0200 +@@ -421,7 +421,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -409,7 +409,7 @@ Manufacturer "HP" +@@ -429,7 +429,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -426,7 +426,7 @@ Manufacturer "HP" +@@ -446,7 +446,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -474,7 +474,7 @@ Manufacturer "HP" +@@ -494,7 +494,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -490,7 +490,7 @@ Manufacturer "HP" +@@ -510,7 +510,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -506,7 +506,7 @@ Manufacturer "HP" +@@ -526,7 +526,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -514,7 +514,7 @@ Manufacturer "HP" +@@ -534,7 +534,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -546,7 +546,7 @@ Manufacturer "HP" +@@ -566,7 +566,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -562,7 +562,7 @@ Manufacturer "HP" +@@ -582,7 +582,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -581,7 +581,7 @@ Manufacturer "HP" +@@ -601,7 +601,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -622,7 +622,7 @@ Manufacturer "HP" +@@ -642,7 +642,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -641,7 +641,7 @@ Manufacturer "HP" +@@ -661,7 +661,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -706,7 +706,7 @@ Manufacturer "HP" +@@ -718,7 +718,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 959c" + Attribute "NickName" "" "HP Deskjet 959c, $Version" + Attribute "ShortNickName" "" "HP Deskjet 959c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_959c.ppd" + Attribute "Product" "" "(HP Deskjet 959c Printer)" + } +@@ -726,7 +726,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -118,7 +127,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -726,7 +726,7 @@ Manufacturer "HP" +@@ -746,7 +746,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -127,7 +136,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -735,7 +735,7 @@ Manufacturer "HP" +@@ -755,7 +755,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -136,7 +145,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -769,7 +769,7 @@ Manufacturer "HP" +@@ -789,7 +789,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -145,7 +154,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -807,7 +807,7 @@ Manufacturer "HP" +@@ -827,7 +827,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -154,7 +163,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -815,7 +815,7 @@ Manufacturer "HP" +@@ -835,7 +835,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -163,7 +172,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -866,7 +866,7 @@ Manufacturer "HP" +@@ -886,7 +886,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -172,7 +181,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1062,7 +1062,7 @@ Manufacturer "HP" +@@ -1082,7 +1082,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -181,7 +190,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1504,7 +1504,7 @@ Manufacturer "HP" +@@ -1524,7 +1524,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -190,7 +199,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1527,7 +1527,7 @@ Manufacturer "HP" +@@ -1547,7 +1547,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -199,7 +208,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1537,7 +1537,7 @@ Manufacturer "HP" +@@ -1557,7 +1557,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -208,7 +217,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1546,7 +1546,7 @@ Manufacturer "HP" +@@ -1566,7 +1566,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -217,7 +226,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1609,7 +1609,7 @@ Manufacturer "HP" +@@ -1629,7 +1629,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -226,7 +235,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1617,7 +1617,7 @@ Manufacturer "HP" +@@ -1637,7 +1637,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -235,7 +244,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1630,7 +1630,7 @@ Manufacturer "HP" +@@ -1650,7 +1650,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -244,7 +253,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1638,7 +1638,7 @@ Manufacturer "HP" +@@ -1658,7 +1658,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -253,7 +262,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1675,7 +1675,7 @@ Manufacturer "HP" +@@ -1695,7 +1695,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -262,7 +271,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1905,7 +1905,7 @@ Manufacturer "HP" +@@ -1925,7 +1925,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -271,7 +280,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1915,7 +1915,7 @@ Manufacturer "HP" +@@ -1935,7 +1935,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -280,7 +289,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1923,7 +1923,7 @@ Manufacturer "HP" +@@ -1943,7 +1943,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -289,7 +298,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1932,7 +1932,7 @@ Manufacturer "HP" +@@ -1952,7 +1952,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -298,7 +307,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2471,7 +2471,7 @@ Manufacturer "HP" +@@ -2465,7 +2465,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -307,7 +316,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_1600_series.ppd" Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" -@@ -2487,7 +2487,7 @@ Manufacturer "HP" +@@ -2481,7 +2481,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -316,7 +325,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2505,7 +2505,7 @@ Manufacturer "HP" +@@ -2499,7 +2499,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -325,7 +334,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2514,7 +2514,7 @@ Manufacturer "HP" +@@ -2508,7 +2508,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -334,7 +343,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2531,7 +2531,7 @@ Manufacturer "HP" +@@ -2525,7 +2525,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -343,7 +352,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2557,7 +2557,7 @@ Manufacturer "HP" +@@ -2551,7 +2551,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -352,7 +361,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3032,7 +3032,7 @@ Manufacturer "HP" +@@ -3012,7 +3012,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -361,7 +370,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3121,7 +3121,7 @@ Manufacturer "HP" +@@ -3085,7 +3085,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -370,7 +379,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3190,7 +3190,7 @@ Manufacturer "HP" +@@ -3140,7 +3140,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -379,7 +388,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3377,7 +3377,7 @@ Manufacturer "HP" +@@ -3309,7 +3309,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -388,16 +397,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3414,7 +3414,7 @@ Manufacturer "HP" - ModelName "HP Officejet 7300 Series" - Attribute "NickName" "" "HP Officejet 7300 Series, $Version" - Attribute "ShortNickName" "" "HP Officejet 7300 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7300 series;DES:officejet 7300 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7300 series;DES:officejet 7300 series;" - PCFileName "hp-officejet_7300_series.ppd" - Attribute "Product" "" "(HP Officejet 7310 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 7310xi All-in-one Printer)" -@@ -3462,7 +3462,7 @@ Manufacturer "HP" +@@ -3394,7 +3394,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -5273,7 +5273,7 @@ Manufacturer "HP" +@@ -7292,7 +7292,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -5283,7 +5283,7 @@ Manufacturer "HP" +@@ -7302,7 +7302,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -5475,7 +5475,7 @@ Manufacturer "HP" +@@ -7485,7 +7485,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3940" + Attribute "NickName" "" "HP Deskjet 3940, $Version" + Attribute "ShortNickName" "" "HP Deskjet 3940" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3940;DES:deskjet 3940;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:Deskjet 3900;DES:3940;" + PCFileName "hp-deskjet_3940.ppd" + Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" +@@ -7494,7 +7494,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -433,7 +442,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -5502,7 +5502,7 @@ Manufacturer "HP" +@@ -7521,7 +7521,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -442,7 +451,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -5800,7 +5800,7 @@ Manufacturer "HP" +@@ -7819,7 +7819,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -451,7 +460,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -5871,7 +5871,7 @@ Manufacturer "HP" +@@ -7890,7 +7890,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -460,7 +469,15 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -6835,7 +6835,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8387,6 +8387,7 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Photosmart 380 Series, $Version" + Attribute "ShortNickName" "" "HP Photosmart 380 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;" + PCFileName "hp-photosmart_380_series.ppd" + Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" + Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" +@@ -8814,7 +8815,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -469,7 +486,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -6861,7 +6861,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8840,7 +8841,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -478,7 +495,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -6869,7 +6869,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8848,7 +8849,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -487,7 +504,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -6879,7 +6879,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8858,7 +8859,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -496,7 +513,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -6887,7 +6887,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8866,7 +8867,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -505,7 +522,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -6899,7 +6899,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8878,7 +8879,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -514,7 +531,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -6907,7 +6907,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8886,7 +8887,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -523,7 +540,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -6917,7 +6917,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8896,7 +8897,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -532,7 +549,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -6959,7 +6959,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8938,7 +8939,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -541,7 +558,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -6977,7 +6977,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8956,7 +8957,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -550,7 +567,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -6994,7 +6994,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -559,7 +576,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -7002,7 +7002,7 @@ Group "RLT/HP Real Life Technologies" +@@ -8981,7 +8982,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -568,7 +585,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -7027,7 +7027,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9006,7 +9007,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -577,7 +594,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -7035,7 +7035,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9014,7 +9015,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -586,7 +603,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -7060,7 +7060,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9039,7 +9040,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -595,7 +612,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -7157,7 +7157,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9063,7 +9064,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1320" + Attribute "NickName" "" "HP LaserJet 1320, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1320" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320;DES:hp laserjet 1320;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + PCFileName "hp-laserjet_1320.ppd" + Attribute "Product" "" "(HP LaserJet 1320 Printer)" + Attribute "Product" "" "(HP LaserJet 1320t Printer)" +@@ -9136,7 +9137,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -604,7 +630,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -7233,7 +7233,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9212,7 +9213,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -613,7 +639,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -7249,7 +7249,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9228,7 +9229,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -622,7 +648,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -9241,7 +9241,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9241,7 +9242,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -631,7 +657,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -7275,7 +7275,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9254,7 +9255,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -640,7 +666,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -7291,7 +7291,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9270,7 +9271,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -649,7 +675,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -7302,7 +7302,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9281,7 +9282,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -658,7 +684,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -7352,7 +7352,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9331,7 +9332,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -667,7 +693,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -7360,7 +7360,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9339,7 +9340,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -676,7 +702,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -7368,7 +7368,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9347,7 +9348,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -685,7 +711,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -7377,7 +7377,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9356,7 +9357,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -694,7 +720,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -7385,7 +7385,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9364,7 +9365,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -703,7 +729,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -7394,7 +7394,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9373,7 +9374,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -712,7 +738,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -7402,7 +7402,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9381,7 +9382,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -721,7 +747,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -7430,7 +7430,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9409,7 +9410,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -730,7 +756,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -7446,7 +7446,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9425,7 +9426,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -739,7 +765,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -7466,7 +7466,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9445,7 +9446,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -748,7 +774,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -7474,7 +7474,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9453,7 +9454,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -757,7 +783,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -7482,7 +7482,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9461,7 +9462,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -766,7 +792,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -7498,7 +7498,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9477,7 +9478,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -775,7 +801,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -7574,7 +7574,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9553,7 +9554,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" @@ -784,7 +810,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -7586,7 +7586,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" @@ -793,7 +819,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -7614,7 +7614,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9593,7 +9594,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -802,7 +828,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -7639,7 +7639,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9618,7 +9619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -811,7 +837,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -7651,7 +7651,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9630,7 +9631,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -820,7 +846,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -7664,7 +7664,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9643,7 +9644,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -829,7 +855,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -7675,7 +7675,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9654,7 +9655,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -838,7 +864,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -7746,7 +7746,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9725,7 +9726,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -847,7 +873,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -7856,7 +7856,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9835,7 +9836,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -856,7 +882,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -7892,7 +7892,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9871,7 +9872,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -865,7 +891,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -7913,7 +7913,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9892,7 +9893,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -874,7 +900,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -7921,7 +7921,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9900,7 +9901,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -883,7 +909,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -7982,7 +7982,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9961,7 +9962,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -892,7 +918,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -8259,7 +8259,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -901,7 +927,16 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -8428,7 +8428,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10360,7 +10361,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3800" + Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3800" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:HP Color LaserJet 3800;DES:HP Color LaserJet 3800;" + PCFileName "hp-color_laserjet_3800-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" +@@ -10407,7 +10408,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -910,7 +945,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -8441,7 +8441,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10420,7 +10421,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -919,7 +954,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -8539,7 +8539,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10518,7 +10519,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -928,7 +963,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -8580,7 +8580,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10559,7 +10560,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -937,7 +972,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -8872,7 +8872,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10851,7 +10852,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -946,7 +981,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -8880,7 +8880,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10859,7 +10860,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -955,7 +990,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -9088,7 +9088,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11067,7 +11068,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -964,7 +999,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -9252,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11231,7 +11232,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -973,7 +1008,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -9276,7 +9276,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11255,7 +11256,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -982,7 +1017,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -9293,7 +9293,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11272,7 +11273,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -991,7 +1026,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -9418,7 +9418,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11397,7 +11398,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1000,7 +1035,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -9434,7 +9434,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11413,7 +11414,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1009,7 +1044,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -9547,7 +9547,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11526,7 +11527,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1018,7 +1053,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -9569,7 +9569,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11548,7 +11549,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 500" Attribute "NickName" "" "HP Officejet Series 500, $Version" Attribute "ShortNickName" "" "HP Officejet Series 500" @@ -1027,7 +1062,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -9609,7 +9609,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11588,7 +11589,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1036,7 +1071,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -9661,7 +9661,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11640,7 +11641,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1045,7 +1080,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -9813,7 +9813,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11792,7 +11793,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1054,7 +1089,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -9837,7 +9837,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11816,7 +11817,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1063,7 +1098,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -9857,7 +9857,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11836,7 +11837,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1072,7 +1107,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -9917,7 +9917,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11896,7 +11897,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1081,7 +1116,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -10060,7 +10060,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12039,7 +12040,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, $Version" Attribute "ShortNickName" "" "HP Officejet T Series" @@ -1090,7 +1125,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -10071,7 +10071,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12050,7 +12051,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1099,7 +1134,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -10095,7 +10095,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12074,7 +12075,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1108,7 +1143,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -10103,7 +10103,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1117,7 +1152,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -10119,7 +10119,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12098,7 +12099,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1126,7 +1161,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -10127,7 +10127,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12106,7 +12107,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1135,7 +1170,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -10144,7 +10144,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12123,7 +12124,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1144,7 +1179,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -10152,7 +10152,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12131,7 +12132,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1153,7 +1188,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -10184,7 +10184,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12163,7 +12164,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1162,7 +1197,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -10192,7 +10192,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12171,7 +12172,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1171,7 +1206,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -10208,7 +10208,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12187,7 +12188,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1180,7 +1215,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -10217,7 +10217,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12196,7 +12197,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1189,7 +1224,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -10233,7 +10233,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12212,7 +12213,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1198,7 +1233,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -10350,7 +10350,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12329,7 +12330,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1207,7 +1242,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -10359,7 +10359,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1216,7 +1251,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -10470,7 +10470,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1225,7 +1260,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -10489,7 +10489,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1234,7 +1269,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -10500,7 +10500,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12479,7 +12480,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1243,7 +1278,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -10614,7 +10614,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12593,7 +12594,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1252,7 +1287,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -10623,7 +10623,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12602,7 +12603,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1261,7 +1296,25 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -11116,7 +11116,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1018" + Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1018" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1018;DES:HP LaserJet 1018;" + PCFileName "hp-laserjet_1018.ppd" + Attribute "Product" "" "(HP LaserJet 1018 Printer)" + Attribute "Product" "" "(HP LaserJet 1018s Printer)" +@@ -12753,7 +12754,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1020" + Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1020" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1020;DES:HP LaserJet 1020;" + PCFileName "hp-laserjet_1020.ppd" + Attribute "Product" "" "(HP LaserJet 1020 Printer)" + Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" +@@ -13095,7 +13096,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1270,7 +1323,7 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -11126,7 +11126,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13105,7 +13106,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1279,3 +1332,12 @@ diff -up hplip-3.9.12/prnt/drv/hpcups.drv.in.device-ids hplip-3.9.12/prnt/drv/hp PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } +@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p1006" + Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1006" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1006;DES:HP LaserJet P1006;" + PCFileName "hp-laserjet_p1006.ppd" + Attribute "Product" "" "(HP LaserJet p1006 Printer)" + } diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch new file mode 100644 index 0000000..c8f8ed2 --- /dev/null +++ b/hplip-deviceIDs-ppd.patch @@ -0,0 +1,143 @@ +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:01.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-01 15:41:31.000000000 +0200 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 1200)" + *Product: "(Hewlett-Packard HP LaserJet 1200)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-04-01 15:37:11.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-01 15:40:52.000000000 +0200 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 1200)" + *Product: "(Hewlett-Packard HP LaserJet 1200)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-08 17:44:22.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-08 17:44:38.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-08 17:44:43.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-08 17:44:48.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-08 17:44:53.000000000 +0200 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:23.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-01 15:39:35.000000000 +0200 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-04-01 15:38:36.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-01 15:39:58.000000000 +0200 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-08 17:45:10.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-08 17:45:15.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-08 17:45:19.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-04-08 17:43:19.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-08 17:45:25.000000000 +0200 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= diff --git a/hplip-laserjet_2300-deviceID.patch b/hplip-laserjet_2300-deviceID.patch deleted file mode 100644 index 5b46325..0000000 --- a/hplip-laserjet_2300-deviceID.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:32.000000000 +0100 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-03-26 16:16:30.000000000 +0100 -@@ -61,6 +61,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.laserjet_2300-deviceID 2010-03-26 16:14:35.000000000 +0100 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-03-26 16:16:38.000000000 +0100 -@@ -61,6 +61,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= diff --git a/hplip.spec b/hplip.spec index f3529cf..299a067 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 8.1%{?dist} +Release: 9%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -18,7 +18,7 @@ Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch -Patch5: hplip-device-ids.patch +Patch5: hplip-deviceIDs-drv.patch Patch6: hplip-mucks-with-spooldir.patch Patch7: hplip-udev-rules.patch Patch8: hplip-retry-open.patch @@ -27,7 +27,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch -Patch17: hplip-laserjet_2300-deviceID.patch +Patch17: hplip-deviceIDs-ppd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. -%patch5 -p1 -b .device-ids +%patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files # directly (bug #552572). @@ -161,12 +161,20 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning -# Add Device ID for HP LaserJet 2300 (#576928) -gunzip prnt/ps/hp-laserjet_2300-ps.ppd.gz -gunzip prnt/ps/hp-laserjet_2300_series-ps.ppd.gz -%patch17 -p1 -b .laserjet_2300-deviceID -gzip -n prnt/ps/hp-laserjet_2300-ps.ppd -gzip -n prnt/ps/hp-laserjet_2300_series-ps.ppd +# Add Device ID for +# HP LaserJet 1200 (bug #577308) +# HP LaserJet 1320 series (bug #579920) +# HP LaserJet 2300 (bug #576928) +# HP LaserJet P2015 Series (bug #580231) +for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch17 -p1 -b .deviceIDs-ppd +for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ @@ -389,6 +397,11 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Fri Apr 9 2010 Jiri Popelka - 3.10.2-9 +- Added/Corrected several IEEE 1284 Device IDs + (bugs #577262, #577282, #577282, #577288, #577292, #577302, + ,#577306, #577308, #577898, #579920, #580231) + * Wed Apr 7 2010 Tim Waugh - 3.10.2-8.1 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355).