rpms/hplip/devel hplip-deviceIDs-drv.patch, NONE, 1.1 hplip-deviceIDs-ppd.patch, NONE, 1.1 hplip.spec, 1.268, 1.269 hplip-device-ids.patch, 1.2, NONE hplip-laserjet_2300-deviceID.patch, 1.1, NONE

Jiří Popelka jpopelka at fedoraproject.org
Fri Apr 9 12:25:36 UTC 2010


Author: jpopelka

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24402

Modified Files:
	hplip.spec 
Added Files:
	hplip-deviceIDs-drv.patch hplip-deviceIDs-ppd.patch 
Removed Files:
	hplip-device-ids.patch hplip-laserjet_2300-deviceID.patch 
Log Message:
* Fri Apr  9 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-9
- Added/Corrected several IEEE 1284 Device IDs
  (bugs #577262, #577282, #577282, #577288, #577292, #577302,
  ,#577306, #577308, #577898, #579920, #580231)


hplip-deviceIDs-drv.patch:
 hpcups.drv.in |  297 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 149 insertions(+), 148 deletions(-)

--- NEW FILE hplip-deviceIDs-drv.patch ---
diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in
--- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv	2010-02-25 00:09:42.000000000 +0100
+++ hplip-3.10.2/prnt/drv/hpcups.drv.in	2010-04-09 11:09:10.000000000 +0200
@@ -421,7 +421,7 @@ Manufacturer "HP"
       ModelName "HP Officejet v40xi"
       Attribute "NickName" "" "HP Officejet v40xi, $Version"
       Attribute "ShortNickName" "" "HP Officejet v40xi"
-      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)"
     }
@@ -429,7 +429,7 @@ Manufacturer "HP"
       ModelName "HP Officejet v40"
       Attribute "NickName" "" "HP Officejet v40, $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)"
@@ -446,7 +446,7 @@ Manufacturer "HP"
       ModelName "HP Officejet g55"
       Attribute "NickName" "" "HP Officejet g55, $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)"
     }
@@ -494,7 +494,7 @@ Manufacturer "HP"
       ModelName "HP Officejet g85"
       Attribute "NickName" "" "HP Officejet g85, $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)"
     }
@@ -510,7 +510,7 @@ Manufacturer "HP"
       ModelName "HP Officejet g95"
       Attribute "NickName" "" "HP Officejet g95, $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)"
     }
@@ -526,7 +526,7 @@ Manufacturer "HP"
       ModelName "HP PSC 750xi"
       Attribute "NickName" "" "HP PSC 750xi, $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)"
     }
@@ -534,7 +534,7 @@ Manufacturer "HP"
       ModelName "HP PSC 750"
       Attribute "NickName" "" "HP PSC 750, $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)"
     }
@@ -566,7 +566,7 @@ Manufacturer "HP"
       ModelName "HP PSC 900 Series"
       Attribute "NickName" "" "HP PSC 900 Series, $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)"
     }
@@ -582,7 +582,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 920c"
       Attribute "NickName" "" "HP Deskjet 920c, $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)"
@@ -601,7 +601,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 930c"
       Attribute "NickName" "" "HP Deskjet 930c, $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)"
@@ -642,7 +642,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 940c"
       Attribute "NickName" "" "HP Deskjet 940c, $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)"
@@ -661,7 +661,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 950c"
       Attribute "NickName" "" "HP Deskjet 950c, $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)"
     }
@@ -718,7 +718,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 959c"
       Attribute "NickName" "" "HP Deskjet 959c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 959c"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;"
+      Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;"
       PCFileName "hp-deskjet_959c.ppd"
       Attribute "Product" "" "(HP Deskjet 959c Printer)"
     }
@@ -726,7 +726,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 970c"
       Attribute "NickName" "" "HP Deskjet 970c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 970c"
-      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)"
@@ -746,7 +746,7 @@ Manufacturer "HP"
       ModelName "HP Photosmart p1000"
       Attribute "NickName" "" "HP Photosmart p1000, $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)"
@@ -755,7 +755,7 @@ Manufacturer "HP"
       ModelName "HP Photosmart p1100"
       Attribute "NickName" "" "HP Photosmart p1100, $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)"
@@ -789,7 +789,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 3820"
       Attribute "NickName" "" "HP Deskjet 3820, $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)"
@@ -827,7 +827,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 5105"
       Attribute "NickName" "" "HP Officejet 5105, $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)"
     }
@@ -835,7 +835,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 5110v"
       Attribute "NickName" "" "HP Officejet 5110v, $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)"
     }
@@ -886,7 +886,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 1220c"
       Attribute "NickName" "" "HP Deskjet 1220c, $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)"
@@ -1082,7 +1082,7 @@ Manufacturer "HP"
       ModelName "HP 2000c"
       Attribute "NickName" "" "HP 2000c, $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)"
@@ -1524,7 +1524,7 @@ Manufacturer "HP"
       ModelName "HP Officejet D Series"
       Attribute "NickName" "" "HP Officejet D Series, $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)"
@@ -1547,7 +1547,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 960c"
       Attribute "NickName" "" "HP Deskjet 960c, $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)"
@@ -1557,7 +1557,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 980c"
       Attribute "NickName" "" "HP Deskjet 980c, $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)"
@@ -1566,7 +1566,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 990c"
       Attribute "NickName" "" "HP Deskjet 990c, $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)"
@@ -1629,7 +1629,7 @@ Manufacturer "HP"
       ModelName "HP Color Inkjet cp1700"
       Attribute "NickName" "" "HP Color Inkjet cp1700, $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)"
     }
@@ -1637,7 +1637,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2100 Series"
       Attribute "NickName" "" "HP PSC 2100 Series, $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)"
@@ -1650,7 +1650,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2150 Series"
       Attribute "NickName" "" "HP PSC 2150 Series, $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)"
     }
@@ -1658,7 +1658,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2170 Series"
       Attribute "NickName" "" "HP PSC 2170 Series, $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)"
@@ -1695,7 +1695,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 7100 Series"
       Attribute "NickName" "" "HP Officejet 7100 Series, $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)"
@@ -1925,7 +1925,7 @@ Manufacturer "HP"
       ModelName "HP Business Inkjet 2200"
       Attribute "NickName" "" "HP Business Inkjet 2200, $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)"
@@ -1935,7 +1935,7 @@ Manufacturer "HP"
       ModelName "HP Business Inkjet 2230"
       Attribute "NickName" "" "HP Business Inkjet 2230, $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)"
     }
@@ -1943,7 +1943,7 @@ Manufacturer "HP"
       ModelName "HP Business Inkjet 2250"
       Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version"
       Attribute "ShortNickName" "" "HP Business Inkjet 2250"
-      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)"
@@ -1952,7 +1952,7 @@ Manufacturer "HP"
       ModelName "HP Business Inkjet 2280"
       Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version"
       Attribute "ShortNickName" "" "HP Business Inkjet 2280"
-      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)"
@@ -2465,7 +2465,7 @@ Manufacturer "HP"
       ModelName "HP PSC 1600 Series"
       Attribute "NickName" "" "HP PSC 1600 Series, $Version"
       Attribute "ShortNickName" "" "HP PSC 1600 Series"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1600 series;DES:psc 1600 series;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1600 series;DES:psc 1600 series;"
       PCFileName "hp-psc_1600_series.ppd"
       Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)"
       Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)"
@@ -2481,7 +2481,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2200 Series"
       Attribute "NickName" "" "HP PSC 2200 Series, $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)"
     }
@@ -2499,7 +2499,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2300 Series"
       Attribute "NickName" "" "HP PSC 2300 Series, $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)"
@@ -2508,7 +2508,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2350 Series"
       Attribute "NickName" "" "HP PSC 2350 Series, $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)"
@@ -2525,7 +2525,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2400 Series"
       Attribute "NickName" "" "HP PSC 2400 Series, $Version"
       Attribute "ShortNickName" "" "HP PSC 2400 Series"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2400 Series;DES: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)"
@@ -2551,7 +2551,7 @@ Manufacturer "HP"
       ModelName "HP PSC 2500 Series"
       Attribute "NickName" "" "HP PSC 2500 Series, $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)"
@@ -3012,7 +3012,7 @@ Manufacturer "HP"
       ModelName "HP Officejet j5700 Series"
       Attribute "NickName" "" "HP Officejet j5700 Series, $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)"
@@ -3085,7 +3085,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 6100 Series"
       Attribute "NickName" "" "HP Officejet 6100 Series, $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)"
@@ -3140,7 +3140,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 6300 Series"
       Attribute "NickName" "" "HP Officejet 6300 Series, $Version"
       Attribute "ShortNickName" "" "HP Officejet 6300 Series"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6300 series;DES: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)"
@@ -3309,7 +3309,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 7200 Series"
       Attribute "NickName" "" "HP Officejet 7200 Series, $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)"
@@ -3394,7 +3394,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 7400 Series"
       Attribute "NickName" "" "HP Officejet 7400 Series, $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)"
@@ -7292,7 +7292,7 @@ Manufacturer "HP"
       ModelName "HP PSC 1100 Series"
       Attribute "NickName" "" "HP PSC 1100 Series, $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)"
@@ -7302,7 +7302,7 @@ Manufacturer "HP"
       ModelName "HP PSC 1200 Series"
       Attribute "NickName" "" "HP PSC 1200 Series, $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)"
@@ -7485,7 +7485,7 @@ Manufacturer "HP"
       ModelName "HP Deskjet 3940"
       Attribute "NickName" "" "HP Deskjet 3940, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 3940"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3940;DES:deskjet 3940;"
+      Attribute "1284DeviceID" "" "MFG:HP;MDL:Deskjet 3900;DES:3940;"
       PCFileName "hp-deskjet_3940.ppd"
       Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)"
       Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)"
@@ -7494,7 +7494,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 4100 Series"
       Attribute "NickName" "" "HP Officejet 4100 Series, $Version"
       Attribute "ShortNickName" "" "HP Officejet 4100 Series"
-      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)"
@@ -7521,7 +7521,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 4300 Series"
       Attribute "NickName" "" "HP Officejet 4300 Series, $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)"
@@ -7819,7 +7819,7 @@ Manufacturer "HP"
       ModelName "HP Officejet j3600 Series"
       Attribute "NickName" "" "HP Officejet j3600 Series, $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)"
@@ -7890,7 +7890,7 @@ Manufacturer "HP"
       ModelName "HP Officejet 4200 Series"
       Attribute "NickName" "" "HP Officejet 4200 Series, $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)"
@@ -8387,6 +8387,7 @@ Manufacturer "HP"
       Attribute "NickName" "" "HP Photosmart 380 Series, $Version"
       Attribute "ShortNickName" "" "HP Photosmart 380 Series"
       Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;"
+      Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;"
       PCFileName "hp-photosmart_380_series.ppd"
       Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)"
       Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)"
@@ -8814,7 +8815,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4 Plus"
       Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4 Plus"
-      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)"
@@ -8840,7 +8841,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 5mp"
       Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 5mp"
-      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)"
     }
@@ -8848,7 +8849,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 5l"
       Attribute "NickName" "" "HP LaserJet 5l, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 5l"
-      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)"
@@ -8858,7 +8859,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 5p"
       Attribute "NickName" "" "HP LaserJet 5p, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 5p"
-      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)"
     }
@@ -8866,7 +8867,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 6l"
       Attribute "NickName" "" "HP LaserJet 6l, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 6l"
-      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)"
@@ -8878,7 +8879,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 6p"
       Attribute "NickName" "" "HP LaserJet 6p, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 6p"
-      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)"
     }
@@ -8886,7 +8887,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 6mp"
       Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 6mp"
-      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)"
@@ -8896,7 +8897,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1015"
       Attribute "NickName" "" "HP LaserJet 1015, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1015"
-      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)"
     }
@@ -8938,7 +8939,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1100"
       Attribute "NickName" "" "HP LaserJet 1100, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1100"
-      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)"
@@ -8956,7 +8957,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1150"
       Attribute "NickName" "" "HP LaserJet 1150, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1150"
-      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)"
     }
@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1160 Series"
       Attribute "NickName" "" "HP LaserJet 1160 Series, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1160 Series"
-      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)"
     }
@@ -8981,7 +8982,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1200"
       Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1200"
-      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)"
@@ -9006,7 +9007,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1220"
       Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1220"
-      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)"
     }
@@ -9014,7 +9015,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1300"
       Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1300"
-      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)"
@@ -9039,7 +9040,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1320 Series"
       Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1320 Series"
-      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)"
     }
@@ -9063,7 +9064,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1320"
       Attribute "NickName" "" "HP LaserJet 1320, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1320"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320;DES:hp laserjet 1320;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
       PCFileName "hp-laserjet_1320.ppd"
       Attribute "Product" "" "(HP LaserJet 1320 Printer)"
       Attribute "Product" "" "(HP LaserJet 1320t Printer)"
@@ -9136,7 +9137,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet p2015 Series"
       Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet p2015 Series"
-      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)"
     }
@@ -9212,7 +9213,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 2100 Series"
       Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 2100 Series"
-      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)"
     }
@@ -9228,7 +9229,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 2200"
       Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 2200"
-      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)"
@@ -9241,7 +9242,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 2300"
       Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 2300"
-      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)"
@@ -9254,7 +9255,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 2300 Series"
       Attribute "NickName" "" "HP LaserJet 2300 Series, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 2300 Series"
-      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)"
     }
@@ -9270,7 +9271,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 2420"
       Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 2420"
-      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)"
@@ -9281,7 +9282,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 2430"
       Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 2430"
-      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)"
@@ -9331,7 +9332,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3015"
       Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3015"
-      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)"
     }
@@ -9339,7 +9340,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3020"
       Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3020"
-      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)"
     }
@@ -9347,7 +9348,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet m3027 MFP"
       Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet m3027 MFP"
-      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)"
@@ -9356,7 +9357,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3030"
       Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3030"
-      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)"
     }
@@ -9364,7 +9365,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3050"
       Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3050"
-      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)"
@@ -9373,7 +9374,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3052"
       Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3052"
-      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)"
     }
@@ -9381,7 +9382,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3055"
       Attribute "NickName" "" "HP LaserJet 3055, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3055"
-      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)"
     }
@@ -9409,7 +9410,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3200m"
       Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3200m"
-      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)"
     }
@@ -9425,7 +9426,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3200"
       Attribute "NickName" "" "HP LaserJet 3200, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3200"
-      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)"
     }
@@ -9445,7 +9446,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3330"
       Attribute "NickName" "" "HP LaserJet 3330, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3330"
-      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)"
     }
@@ -9453,7 +9454,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3380"
       Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3380"
-      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)"
     }
@@ -9461,7 +9462,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 3390"
       Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 3390"
-      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)"
     }
@@ -9477,7 +9478,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4000 Series"
       Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4000 Series"
-      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)"
@@ -9553,7 +9554,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4050 Series"
       Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4050 Series"
-      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)"
@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4100 Series"
       Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4100 Series"
-      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)"
@@ -9593,7 +9594,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4200"
       Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4200"
-      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)"
@@ -9618,7 +9619,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4250"
       Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4250"
-      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)"
@@ -9630,7 +9631,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4300"
       Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4300"
-      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)"
@@ -9643,7 +9644,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 4345 MFP"
       Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 4345 MFP"
-      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)"
@@ -9654,7 +9655,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet m4345 MFP"
       Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet m4345 MFP"
-      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)"
@@ -9725,7 +9726,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 5000 Series"
       Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 5000 Series"
-      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)"
     }
@@ -9835,7 +9836,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 5si"
       Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 5si"
-      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)"
@@ -9871,7 +9872,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet m3035 MFP"
       Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet m3035 MFP"
-      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)"
@@ -9892,7 +9893,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet m5025 MFP"
       Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet m5025 MFP"
-      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)"
     }
@@ -9900,7 +9901,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet m5035 MFP"
       Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet m5035 MFP"
-      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)"
@@ -9961,7 +9962,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 8150 Series"
       Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 8150 Series"
-      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)"
@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Business Inkjet 2300"
       Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version"
       Attribute "ShortNickName" "" "HP Business Inkjet 2300"
-      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)"
@@ -10360,7 +10361,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Color LaserJet 3800"
       Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version"
       Attribute "ShortNickName" "" "HP Color LaserJet 3800"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;"
+      Attribute "1284DeviceID" "" "MFG:HP;MDL:HP Color LaserJet 3800;DES:HP Color LaserJet 3800;"
       PCFileName "hp-color_laserjet_3800-pcl3.ppd"
       Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
       Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
@@ -10407,7 +10408,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Color LaserJet 4550"
       Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version"
       Attribute "ShortNickName" "" "HP Color LaserJet 4550"
-      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)"
@@ -10420,7 +10421,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Color LaserJet 4600 Series"
       Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version"
       Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series"
-      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)"
@@ -10518,7 +10519,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet 9100 Series"
       Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version"
       Attribute "ShortNickName" "" "HP Officejet 9100 Series"
-      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)"
@@ -10559,7 +10560,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Business Inkjet 2800"
       Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version"
       Attribute "ShortNickName" "" "HP Business Inkjet 2800"
-      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)"
@@ -10851,7 +10852,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1010"
       Attribute "NickName" "" "HP LaserJet 1010, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1010"
-      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)"
     }
@@ -10859,7 +10860,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1012"
       Attribute "NickName" "" "HP LaserJet 1012, $Version"
       Attribute "ShortNickName" "" "HP LaserJet 1012"
-      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)"
     }
@@ -11067,7 +11068,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet Lx"
       Attribute "NickName" "" "HP Officejet Lx, $Version"
       Attribute "ShortNickName" "" "HP Officejet Lx"
-      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)"
     }
@@ -11231,7 +11232,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet Series 300"
       Attribute "NickName" "" "HP Officejet Series 300, $Version"
       Attribute "ShortNickName" "" "HP Officejet Series 300"
-      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)"
     }
@@ -11255,7 +11256,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 400"
       Attribute "NickName" "" "HP Deskjet 400, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 400"
-      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)"
@@ -11272,7 +11273,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 540"
       Attribute "NickName" "" "HP Deskjet 540, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 540"
-      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)"
     }
@@ -11397,7 +11398,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 630c"
       Attribute "NickName" "" "HP Deskjet 630c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 630c"
-      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)"
     }
@@ -11413,7 +11414,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 656c"
       Attribute "NickName" "" "HP Deskjet 656c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 656c"
-      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)"
@@ -11526,7 +11527,7 @@ Group "RLT/HP Real Life Technologies"
         ModelName "HP Deskjet 600"
         Attribute "NickName" "" "HP Deskjet 600, $Version"
         Attribute "ShortNickName" "" "HP Deskjet 600"
-        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)"
@@ -11548,7 +11549,7 @@ Group "RLT/HP Real Life Technologies"
         ModelName "HP Officejet Series 500"
         Attribute "NickName" "" "HP Officejet Series 500, $Version"
         Attribute "ShortNickName" "" "HP Officejet Series 500"
-        Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 500;DES:officejet series 500;"
+        Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 500;DES:officejet series 500;"
         PCFileName "hp-officejet_series_500.ppd"
         Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)"
       }
@@ -11588,7 +11589,7 @@ Group "RLT/HP Real Life Technologies"
         ModelName "HP Officejet Series 600"
         Attribute "NickName" "" "HP Officejet Series 600, $Version"
         Attribute "ShortNickName" "" "HP Officejet Series 600"
-        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)"
       }
@@ -11640,7 +11641,7 @@ Group "RLT/HP Real Life Technologies"
         ModelName "HP Deskjet 670c"
         Attribute "NickName" "" "HP Deskjet 670c, $Version"
         Attribute "ShortNickName" "" "HP Deskjet 670c"
-        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)"
       }
@@ -11792,7 +11793,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 610c"
       Attribute "NickName" "" "HP Deskjet 610c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 610c"
-      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)"
     }
@@ -11816,7 +11817,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 640c"
       Attribute "NickName" "" "HP Deskjet 640c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 640c"
-      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)"
@@ -11836,7 +11837,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 690c"
       Attribute "NickName" "" "HP Deskjet 690c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 690c"
-      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)"
@@ -11896,7 +11897,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet Series 700"
       Attribute "NickName" "" "HP Officejet Series 700, $Version"
       Attribute "ShortNickName" "" "HP Officejet Series 700"
-      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)"
     }
@@ -12039,7 +12040,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet T Series"
       Attribute "NickName" "" "HP Officejet T Series, $Version"
       Attribute "ShortNickName" "" "HP Officejet T Series"
-      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)"
@@ -12050,7 +12051,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet r40"
       Attribute "NickName" "" "HP Officejet r40, $Version"
       Attribute "ShortNickName" "" "HP Officejet r40"
-      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)"
     }
@@ -12074,7 +12075,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet r60"
       Attribute "NickName" "" "HP Officejet r60, $Version"
       Attribute "ShortNickName" "" "HP Officejet r60"
-      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)"
     }
@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet r65"
       Attribute "NickName" "" "HP Officejet r65, $Version"
       Attribute "ShortNickName" "" "HP Officejet r65"
-      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)"
     }
@@ -12098,7 +12099,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet r80"
       Attribute "NickName" "" "HP Officejet r80, $Version"
       Attribute "ShortNickName" "" "HP Officejet r80"
-      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)"
     }
@@ -12106,7 +12107,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP PSC 500"
       Attribute "NickName" "" "HP PSC 500, $Version"
       Attribute "ShortNickName" "" "HP PSC 500"
-      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)"
@@ -12123,7 +12124,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 812c"
       Attribute "NickName" "" "HP Deskjet 812c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 812c"
-      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)"
     }
@@ -12131,7 +12132,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 815c"
       Attribute "NickName" "" "HP Deskjet 815c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 815c"
-      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)"
     }
@@ -12163,7 +12164,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 840c"
       Attribute "NickName" "" "HP Deskjet 840c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 840c"
-      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)"
     }
@@ -12171,7 +12172,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 841c"
       Attribute "NickName" "" "HP Deskjet 841c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 841c"
-      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)"
     }
@@ -12187,7 +12188,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 843c"
       Attribute "NickName" "" "HP Deskjet 843c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 843c"
-      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)"
@@ -12196,7 +12197,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 880c"
       Attribute "NickName" "" "HP Deskjet 880c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 880c"
-      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)"
     }
@@ -12212,7 +12213,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 895c"
       Attribute "NickName" "" "HP Deskjet 895c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 895c"
-      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)"
@@ -12329,7 +12330,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 825c"
       Attribute "NickName" "" "HP Deskjet 825c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 825c"
-      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)"
@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 845c"
       Attribute "NickName" "" "HP Deskjet 845c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 845c"
-      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)"
@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 850c"
       Attribute "NickName" "" "HP Deskjet 850c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 850c"
-      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)"
@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 870c"
       Attribute "NickName" "" "HP Deskjet 870c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 870c"
-      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)"
@@ -12479,7 +12480,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet Pro 1150c"
       Attribute "NickName" "" "HP Officejet Pro 1150c, $Version"
       Attribute "ShortNickName" "" "HP Officejet Pro 1150c"
-      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)"
@@ -12593,7 +12594,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Deskjet 890c"
       Attribute "NickName" "" "HP Deskjet 890c, $Version"
       Attribute "ShortNickName" "" "HP Deskjet 890c"
-      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)"
@@ -12602,7 +12603,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Officejet Pro 1170c Series"
       Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version"
       Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series"
-      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)"
@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1018"
       Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin"
       Attribute "ShortNickName" "" "HP LaserJet 1018"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1018;DES:HP LaserJet 1018;"
       PCFileName "hp-laserjet_1018.ppd"
       Attribute "Product" "" "(HP LaserJet 1018 Printer)"
       Attribute "Product" "" "(HP LaserJet 1018s Printer)"
@@ -12753,7 +12754,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet 1020"
       Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin"
       Attribute "ShortNickName" "" "HP LaserJet 1020"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1020;DES:HP LaserJet 1020;"
       PCFileName "hp-laserjet_1020.ppd"
       Attribute "Product" "" "(HP LaserJet 1020 Printer)"
       Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)"
@@ -13095,7 +13096,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Color LaserJet 3500"
       Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin"
       Attribute "ShortNickName" "" "HP Color LaserJet 3500"
-      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)"
@@ -13105,7 +13106,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP Color LaserJet 3550"
       Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin"
       Attribute "ShortNickName" "" "HP Color LaserJet 3550"
-      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)"
     }
@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies"
       ModelName "HP LaserJet p1006"
       Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin"
       Attribute "ShortNickName" "" "HP LaserJet p1006"
-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;"
+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1006;DES:HP LaserJet P1006;"
       PCFileName "hp-laserjet_p1006.ppd"
       Attribute "Product" "" "(HP LaserJet p1006 Printer)"
     }

hplip-deviceIDs-ppd.patch:
 hp-laserjet_1200-ps.ppd           |    1 +
 hp-laserjet_1200n-ps.ppd          |    1 +
 hp-laserjet_1320-ps.ppd           |    1 +
 hp-laserjet_1320_series-ps.ppd    |    1 +
 hp-laserjet_1320n-ps.ppd          |    1 +
 hp-laserjet_1320nw-ps.ppd         |    1 +
 hp-laserjet_1320tn-ps.ppd         |    1 +
 hp-laserjet_2300-ps.ppd           |    1 +
 hp-laserjet_2300_series-ps.ppd    |    1 +
 hp-laserjet_p2015_series-ps.ppd   |    1 +
 hp-laserjet_p2015dn_series-ps.ppd |    1 +
 hp-laserjet_p2015n_series-ps.ppd  |    1 +
 hp-laserjet_p2015x_series-ps.ppd  |    1 +
 13 files changed, 13 insertions(+)

--- NEW FILE hplip-deviceIDs-ppd.patch ---
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2010-04-01 15:37:01.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd	2010-04-01 15:41:31.000000000 +0200
@@ -56,6 +56,7 @@
 *Product: "(HP LaserJet 1200)"
 *Product: "(Hewlett-Packard HP LaserJet 1200)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2010-04-01 15:37:11.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd	2010-04-01 15:40:52.000000000 +0200
@@ -56,6 +56,7 @@
 *Product: "(HP LaserJet 1200)"
 *Product: "(Hewlett-Packard HP LaserJet 1200)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd	2010-04-08 17:44:22.000000000 +0200
@@ -57,6 +57,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
 *Product: "(HP LaserJet 1320 series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd	2010-04-08 17:44:38.000000000 +0200
@@ -57,6 +57,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
 *Product: "(HP LaserJet 1320 series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd	2010-04-08 17:44:43.000000000 +0200
@@ -57,6 +57,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
 *Product: "(HP LaserJet 1320 series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd	2010-04-08 17:44:48.000000000 +0200
@@ -57,6 +57,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
 *Product: "(HP LaserJet 1320 series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd	2010-04-08 17:44:53.000000000 +0200
@@ -57,6 +57,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
 *Product: "(HP LaserJet 1320 series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
 *PSVersion: "(2014.116) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2010-04-01 15:38:23.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd	2010-04-01 15:39:35.000000000 +0200
@@ -61,6 +61,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 2300L)"
 *Product: "(HP LaserJet 2300L)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
 *PSVersion: "(3010.107) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2010-04-01 15:38:36.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd	2010-04-01 15:39:58.000000000 +0200
@@ -61,6 +61,7 @@
 *Product: "(Hewlett-Packard hp LaserJet 2300L)"
 *Product: "(HP LaserJet 2300L)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
 *PSVersion: "(3010.107) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd	2010-04-08 17:45:10.000000000 +0200
@@ -64,6 +64,7 @@
 *Product: "(HP LaserJet P2015 Series)"
 *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
 *PSVersion: "(3010.107) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd	2010-04-08 17:45:15.000000000 +0200
@@ -64,6 +64,7 @@
 *Product: "(HP LaserJet P2015 Series)"
 *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
 *PSVersion: "(3010.107) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2010-04-08 17:45:19.000000000 +0200
@@ -64,6 +64,7 @@
 *Product: "(HP LaserJet P2015 Series)"
 *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
 *PSVersion: "(3010.107) 0"
 
 *%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd	2010-04-08 17:43:19.000000000 +0200
+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd	2010-04-08 17:45:25.000000000 +0200
@@ -64,6 +64,7 @@
 *Product: "(HP LaserJet P2015 Series)"
 *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
 *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
 *PSVersion: "(3010.107) 0"
 
 *%=================================================


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- hplip.spec	7 Apr 2010 15:36:31 -0000	1.268
+++ hplip.spec	9 Apr 2010 12:25:35 -0000	1.269
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 8.1%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -18,7 +18,7 @@ Patch1: hplip-pstotiff-is-rubbish.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
-Patch5: hplip-device-ids.patch
+Patch5: hplip-deviceIDs-drv.patch
 Patch6: hplip-mucks-with-spooldir.patch
 Patch7: hplip-udev-rules.patch
 Patch8: hplip-retry-open.patch
@@ -27,7 +27,7 @@ Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
-Patch17: hplip-laserjet_2300-deviceID.patch
+Patch17: hplip-deviceIDs-ppd.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %patch4 -p1 -b .no-asm
 
 # Corrected several IEEE 1284 Device IDs using foomatic data.
-%patch5 -p1 -b .device-ids
+%patch5 -p1 -b .deviceIDs-drv
 
 # Stopped hpcups pointlessly trying to read spool files
 # directly (bug #552572).
@@ -161,12 +161,20 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 %patch16 -p1 -b .bad-low-ink-warning
 
-# Add Device ID for HP LaserJet 2300 (#576928)
-gunzip prnt/ps/hp-laserjet_2300-ps.ppd.gz
-gunzip prnt/ps/hp-laserjet_2300_series-ps.ppd.gz
-%patch17 -p1 -b .laserjet_2300-deviceID
-gzip -n prnt/ps/hp-laserjet_2300-ps.ppd
-gzip -n prnt/ps/hp-laserjet_2300_series-ps.ppd
+# Add Device ID for
+# HP LaserJet 1200 (bug #577308)
+# HP LaserJet 1320 series (bug #579920)
+# HP LaserJet 2300 (bug #576928)
+# HP LaserJet P2015 Series (bug #580231)
+for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4);
+do
+  gunzip ${ppd_file#*/}.gz
+done
+%patch17 -p1 -b .deviceIDs-ppd
+for ppd_file in $(grep '^diff' ../hplip-deviceIDs-ppd.patch | cut -d " " -f 4);
+do
+  gzip -n ${ppd_file#*/}
+done
 
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@@ -389,6 +397,11 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Fri Apr  9 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-9
+- Added/Corrected several IEEE 1284 Device IDs
+  (bugs #577262, #577282, #577282, #577288, #577292, #577302,
+  ,#577306, #577308, #577898, #579920, #580231)
+
 * Wed Apr  7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-8.1
 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
 


--- hplip-device-ids.patch DELETED ---


--- hplip-laserjet_2300-deviceID.patch DELETED ---



More information about the scm-commits mailing list