diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/drv/hpcups.drv.in --- hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2014-10-07 10:56:09.000000000 +0200 +++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-10-07 15:57:42.392251535 +0200 @@ -473,7 +473,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } @@ -481,7 +481,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet v40" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" @@ -498,7 +498,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g55" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } @@ -546,7 +546,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g85" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } @@ -562,7 +562,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g95" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } @@ -578,7 +578,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 750xi" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } @@ -586,7 +586,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 750" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } @@ -618,7 +618,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } @@ -634,7 +634,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" @@ -653,7 +653,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" @@ -694,7 +694,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" @@ -737,7 +737,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } @@ -770,7 +770,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, hpcups $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)" } @@ -778,7 +778,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" @@ -798,7 +798,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" @@ -807,7 +807,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" @@ -841,7 +841,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;" PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" @@ -879,7 +879,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5105" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } @@ -887,7 +887,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } @@ -938,7 +938,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;" PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" @@ -1134,7 +1134,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, hpcups $Version" Attribute "ShortNickName" "" "HP 2000c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;" PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" @@ -1576,7 +1576,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet D Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" @@ -1599,7 +1599,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;" PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" @@ -1609,7 +1609,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;" PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" @@ -1618,7 +1618,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;" PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" @@ -1681,7 +1681,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } @@ -1689,7 +1689,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" @@ -1702,7 +1702,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } @@ -1710,7 +1710,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" @@ -1747,7 +1747,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;" PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" @@ -1977,7 +1977,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;" PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" @@ -1987,7 +1987,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;" PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } @@ -1995,7 +1995,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;" PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" @@ -2004,7 +2004,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;" PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" @@ -2539,7 +2539,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } @@ -2557,7 +2557,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" 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)" @@ -2566,7 +2566,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" @@ -2583,7 +2583,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" + Attribute "1284DeviceID" "" "MFG:hp;MDL:psc 2400 series;" 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)" @@ -2609,7 +2609,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" @@ -3057,7 +3057,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" @@ -3143,7 +3143,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" @@ -3198,7 +3198,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" + Attribute "1284DeviceID" "" "MFG:HP;MDL:Officejet 6300 series;" PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" @@ -3367,7 +3367,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;" PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" @@ -3452,7 +3452,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;" PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" @@ -11486,7 +11486,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" @@ -11496,7 +11496,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" @@ -11679,7 +11679,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, hpcups $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)" @@ -11688,7 +11688,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;" 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)" @@ -11715,7 +11715,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;" PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" @@ -12042,7 +12042,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" @@ -12102,7 +12102,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;" PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" @@ -12609,6 +12609,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $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)" @@ -13035,7 +13036,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4 plus;DES:hp laserjet 4 plus;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;DES:hp laserjet 4 plus;" PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" @@ -13061,7 +13062,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5l;DES:hp laserjet 5l;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;" PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" @@ -13071,7 +13072,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } @@ -13079,7 +13080,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5p;DES:hp laserjet 5p;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;" PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } @@ -13087,7 +13088,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6l;DES:hp laserjet 6l;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:hp laserjet 6l;" PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" @@ -13099,7 +13100,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6p;DES:hp laserjet 6p;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;" PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } @@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6mp;DES:hp laserjet 6mp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;" PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" @@ -13117,7 +13118,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1015;DES:hp laserjet 1015;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1015;DES:hp laserjet 1015;" PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } @@ -13167,7 +13168,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1100;DES:hp laserjet 1100;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;" PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" @@ -13177,7 +13178,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1150;DES:hp laserjet 1150;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;" PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } @@ -13194,7 +13195,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1160 series;DES:hp laserjet 1160 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;" PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } @@ -13202,7 +13203,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1200;DES:hp laserjet 1200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:hp laserjet 1200;" PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" @@ -13227,7 +13228,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1220;DES:hp laserjet 1220;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;" PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } @@ -13235,7 +13236,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1300;DES:hp laserjet 1300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" @@ -13260,7 +13261,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320 series;DES:hp laserjet 1320 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } @@ -13284,7 +13285,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, hpcups $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)" @@ -13309,7 +13310,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1522nf MFP" Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1522nf mfp;DES:hewlett-packard laserjet m1522nf mfp;" PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" } @@ -13381,7 +13382,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2015 series;DES:hp laserjet p2015 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } @@ -13405,7 +13406,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2035" Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" PCFileName "hp-laserjet_p2035-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } @@ -13445,7 +13446,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100" Attribute "NickName" "" "HP LaserJet 2100, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2100" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100;DES:hp laserjet 2100;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:hp laserjet 2100;" PCFileName "hp-laserjet_2100.ppd" Attribute "Product" "" "(HP LaserJet 2100 Printer)" Attribute "Product" "" "(HP LaserJet 2100m Printer)" @@ -13457,7 +13458,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100 series;DES:hp laserjet 2100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;" PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } @@ -13465,7 +13466,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200 Series" Attribute "NickName" "" "HP LaserJet 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200 series;DES:hp laserjet 2200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" PCFileName "hp-laserjet_2200_series.ppd" Attribute "Product" "" "(HP LaserJet 2200 Series Printer)" } @@ -13473,7 +13474,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200;DES:hp laserjet 2200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" @@ -13486,7 +13487,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300;DES:hp laserjet 2300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" @@ -13499,7 +13500,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300 series;DES:hp laserjet 2300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } @@ -13515,7 +13516,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2420;DES:hp laserjet 2420;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;" PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" @@ -13526,7 +13527,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2430;DES:hp laserjet 2430;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;" PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" @@ -13554,7 +13555,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3005" Attribute "NickName" "" "HP LaserJet p3005 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p3005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3005;DES:hp laserjet p3005;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;DES:hp laserjet p3005;" PCFileName "hp-laserjet_p3005-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3005 Printer)" Attribute "Product" "" "(HP LaserJet p3005d Printer)" @@ -13567,7 +13568,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3010 Series" Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p3010 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3010 series;DES:hp laserjet p3010 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;DES:hp laserjet p3010 series;" PCFileName "hp-laserjet_p3010_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3015 Printer)" Attribute "Product" "" "(HP LaserJet p3011 Printer)" @@ -13576,7 +13577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3015;DES:hp laserjet 3015;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;" PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } @@ -13584,7 +13585,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3020;DES:hp laserjet 3020;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;" PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } @@ -13592,7 +13593,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3027 mfp;DES:hp laserjet m3027 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;DES:Hewlett-Packard LaserJet M3027 MFP;" PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" @@ -13601,7 +13602,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3030;DES:hp laserjet 3030;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;" PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } @@ -13609,7 +13610,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3050;DES:hp laserjet 3050;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;" PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" @@ -13618,7 +13619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3052;DES:hp laserjet 3052;" + Attribute "1284DeviceID" "" "MFG:HEwlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;" PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } @@ -13626,7 +13627,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3055;DES:hp laserjet 3055;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;" PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } @@ -13654,7 +13655,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200m;DES:hp laserjet 3200m;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;" PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } @@ -13670,7 +13671,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200;DES:hp laserjet 3200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;" PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } @@ -13690,7 +13691,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3330;DES:hp laserjet 3330;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;" PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } @@ -13698,7 +13699,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3380;DES:hp laserjet 3380;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;" PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } @@ -13706,7 +13707,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3390;DES:hp laserjet 3390;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } @@ -13722,7 +13723,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4000 series;DES:hp laserjet 4000 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;" PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" @@ -13742,7 +13743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4014" Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4014" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4014;DES:hp laserjet p4014;" PCFileName "hp-laserjet_p4014.ppd" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } @@ -13798,7 +13799,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4050 series;DES:hp laserjet 4050 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;DES:Hewlett-Packard LaserJet 4050 Series;" PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" @@ -13819,7 +13820,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4100 series;DES:hp laserjet 4100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;DES:Hewlett-Packard LaserJet 4100 Series;" PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" @@ -13838,7 +13839,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4200;DES:hp laserjet 4200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;" PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" @@ -13863,7 +13864,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4250;DES:hp laserjet 4250;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" @@ -13875,7 +13876,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4300;DES:hp laserjet 4300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;DES:hp laserjet 4300;" PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" @@ -13888,7 +13889,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4345 mfp;DES:hp laserjet 4345 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4345 mfp;DES:hp laserjet 4345 mfp;" PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" @@ -13899,7 +13900,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m4345 mfp;DES:hp laserjet m4345 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M4345 MFP;DES:Hewlett-Packard LaserJet M4345 MFP;" PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" @@ -13918,7 +13919,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4350" Attribute "NickName" "" "HP LaserJet 4350 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4350" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4350;DES:hp laserjet 4350;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;DES:hp laserjet 4350;" PCFileName "hp-laserjet_4350-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4350 Printer)" Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" @@ -13954,7 +13955,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4515" Attribute "NickName" "" "HP LaserJet p4515, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4515" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4515;DES:hp laserjet p4515;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4515;DES:hp laserjet p4515;" PCFileName "hp-laserjet_p4515.ppd" Attribute "Product" "" "(HP LaserJet p4515 Printer)" } @@ -13970,7 +13971,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5000 series;DES:hp laserjet 5000 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;" PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } @@ -13986,7 +13987,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000 Series" Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8000 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000 series;DES:hp laserjet 8000 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000 series;" PCFileName "hp-laserjet_8000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" } @@ -14080,7 +14081,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5si;DES:hp laserjet 5si;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:;" PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" @@ -14116,7 +14117,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3035 mfp;DES:hp laserjet m3035 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;DES:Hewlett-Packard LaserJet M3035 MFP;" PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" @@ -14137,7 +14138,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5025 mfp;DES:hp laserjet m5025 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5025 MFP;DES:Hewlett-Packard LaserJet M5025 MFP;" PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } @@ -14145,7 +14146,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5035 mfp;DES:hp laserjet m5035 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5035 MFP;DES:Hewlett-Packard LaserJet M5035 MFP;" PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" @@ -14163,7 +14164,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5100 Series" Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5100 series;DES:hp laserjet 5100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;DES:hp laserjet 5100 series;" PCFileName "hp-laserjet_5100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5100 Printer)" Attribute "Product" "" "(HP LaserJet 5100le Printer)" @@ -14194,7 +14195,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000" Attribute "NickName" "" "HP LaserJet 8000, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8000" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000;DES:hp laserjet 8000;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000;" PCFileName "hp-laserjet_8000.ppd" Attribute "Product" "" "(HP LaserJet 8000 Printer)" Attribute "Product" "" "(HP LaserJet 8000dn Printer)" @@ -14214,7 +14215,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8150 series;DES:hp laserjet 8150 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;" PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" @@ -14418,7 +14419,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } @@ -14506,7 +14507,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1515n" Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1515n;DES:hp color laserjet cp1515n;" PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" } @@ -14514,7 +14515,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1518ni" Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1518ni;DES:Hewlett-Packard Color LaserJet CP1518ni;" PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" } @@ -14522,7 +14523,9 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025dn" Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;" + // DNS-SD response has no usb_* keys, just ty/product + Attribute "1284DeviceID" "" "MFG:HP;MDL:Color LaserJet CP2025dn;" PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" } @@ -14538,7 +14541,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025n" Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025n;DES:hp color laserjet cp2025n;" PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" } @@ -14554,7 +14557,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" @@ -14564,7 +14567,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2500" Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 2500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;DES:hp color laserjet 2500;" PCFileName "hp-color_laserjet_2500-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" } @@ -14605,7 +14608,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp3525" Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp3525" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;DES:hp color laserjet cp3525;" PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" @@ -14616,7 +14619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm3530 MFP" Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;" PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" @@ -14625,7 +14628,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3700" Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;DES:hp color laserjet 3700;" PCFileName "hp-color_laserjet_3700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" } @@ -14644,7 +14647,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" @@ -14655,7 +14658,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp4005" Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp4005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" PCFileName "hp-color_laserjet_cp4005-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)" Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)" @@ -14683,7 +14686,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp4520 Series" Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4520 Series;DES:hp color laserjet cp4520 series;" PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" } @@ -14691,7 +14694,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm4540 MFP" Attribute "NickName" "" "HP Color LaserJet cm4540 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm4540 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4540 mfp;DES:hp color laserjet cm4540 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;DES:HP Color LaserJet CM4540 MFP;" PCFileName "hp-color_laserjet_cm4540_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)" } @@ -14699,7 +14702,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;DES:Hewlett-Packard Color LaserJet 4550;" PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" @@ -14712,7 +14715,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" @@ -14724,7 +14727,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600" Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:hp color laserjet 4600;" PCFileName "hp-color_laserjet_4600-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" } @@ -14740,7 +14743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4650" Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4650" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;DES:hp color laserjet 4650;" PCFileName "hp-color_laserjet_4650-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" @@ -14752,7 +14755,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4700" Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;DES:hp color laserjet 4700;" PCFileName "hp-color_laserjet_4700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" @@ -14764,7 +14767,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm4730 MFP" Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;DES:hp color laserjet cm4730 mfp;" PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" @@ -14818,7 +14821,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" 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)" @@ -14846,7 +14849,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm2320nf MFP" Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM2320nf MFP;DES:hp color laserjet cm2320nf mfp;" PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" } @@ -14902,7 +14905,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;" PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" @@ -14937,7 +14940,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 5550" Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 5550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 5550;DES:hp color laserjet 5550;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;DES:hp color laserjet 5550;" PCFileName "hp-color_laserjet_5550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" @@ -15194,7 +15197,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1010;DES:hp laserjet 1010;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1010;DES:Hewlett-Packard LaserJet 1010;" PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } @@ -15202,7 +15205,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1012;DES:hp laserjet 1012;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1012;DES:hp laserjet 1012;" PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } @@ -15410,7 +15413,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Lx" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;" PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } @@ -15574,7 +15577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } @@ -15598,7 +15601,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 400" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" @@ -15615,7 +15618,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 540" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;" PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } @@ -15740,7 +15743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;" PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } @@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;" PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" @@ -15869,7 +15872,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;" PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" @@ -15923,7 +15926,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;" PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } @@ -15975,7 +15978,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } @@ -16127,7 +16130,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;" PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } @@ -16151,7 +16154,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;" PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" @@ -16171,7 +16174,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;" PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" @@ -16231,7 +16234,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;" PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } @@ -16374,7 +16377,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet T Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" @@ -16385,7 +16388,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r40" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } @@ -16409,7 +16412,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r60" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } @@ -16417,7 +16420,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r65" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } @@ -16433,7 +16436,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r80" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } @@ -16441,7 +16444,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" @@ -16458,7 +16461,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;" PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } @@ -16466,7 +16469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;" PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } @@ -16498,7 +16501,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;" PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } @@ -16506,7 +16509,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;" PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } @@ -16522,7 +16525,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;" PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" @@ -16531,7 +16534,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;" PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } @@ -16547,7 +16550,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;" PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" @@ -16664,7 +16667,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;" PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" @@ -16673,7 +16676,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;" PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" @@ -16784,7 +16787,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" @@ -16803,7 +16806,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" @@ -16814,7 +16817,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" 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)" @@ -16928,7 +16931,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" @@ -16937,7 +16940,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" 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)" @@ -17079,7 +17082,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" Attribute "NickName" "" "HP LaserJet 1018, hpcups $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)" @@ -17088,7 +17091,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" Attribute "NickName" "" "HP LaserJet 1020, hpcups $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)" @@ -17122,7 +17125,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1120 MFP" Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)" } @@ -17138,7 +17141,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1319f MFP" Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)" } @@ -17154,7 +17157,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2035" Attribute "NickName" "" "HP LaserJet p2035 zjs, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" PCFileName "hp-laserjet_p2035-zjs.ppd" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } @@ -17246,7 +17249,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1102w" Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet Professional p1102w" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" PCFileName "hp-laserjet_professional_p1102w.ppd" Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" } @@ -17254,7 +17257,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1102" Attribute "NickName" "" "HP LaserJet Professional p1102, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet Professional p1102" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" PCFileName "hp-laserjet_professional_p1102.ppd" Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" @@ -17376,7 +17379,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional m1212nf MFP" Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1212nf mfp;DES:hp laserjet professional m1212nf mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet Professional M1212nf MFP;" PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd" Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" } @@ -17612,7 +17615,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1606dn" Attribute "NickName" "" "HP LaserJet Professional p1606dn, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional p1606dn" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1606dn;DES:hp laserjet professional p1606dn;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet Professional P1606dn;" PCFileName "hp-laserjet_professional_p1606dn.ppd" Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" } @@ -17786,7 +17789,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2600n" Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2600n;DES:HP Color LaserJet 2600n;" PCFileName "hp-color_laserjet_2600n.ppd" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } @@ -18304,7 +18307,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3500;DES:hp color laserjet 3500;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3500;DES:Hewlett-Packard color LaserJet 3500;" PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" @@ -18314,7 +18317,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3550;DES:hp color laserjet 3550;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3550;DES:Hewlett-Packard color LaserJet 3550;" PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } @@ -18466,7 +18469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1505" Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1505;DES:HP LaserJet P1505;" PCFileName "hp-laserjet_p1505.ppd" Attribute "Product" "" "(HP LaserJet p1505 Printer)" } @@ -18600,7 +18603,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1005" Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1005;" PCFileName "hp-laserjet_p1005.ppd" Attribute "Product" "" "(HP LaserJet p1005 Printer)" } @@ -18608,7 +18611,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, hpcups $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)" } @@ -18616,7 +18619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;" PCFileName "hp-laserjet_p1007.ppd" Attribute "Product" "" "(HP LaserJet p1007 Printer)" }