diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml --- foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml.device-ids-20100416 2010-04-16 19:07:15.569148536 +0100 +++ foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml 2010-04-16 19:08:42.589148242 +0100 @@ -20,6 +20,13 @@ <charset>us-ascii</charset> </text> </lang> + <autodetect> + <usb> + <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT</commandset> + <manufacturer>Hewlett-Packard</manufacturer> + <model>HP Color LaserJet 3800</model> + </usb> + </autodetect> <functionality>A</functionality> <driver>hplip</driver> <drivers> diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml --- foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml.device-ids-20100416 2010-04-16 19:07:15.587147834 +0100 +++ foomatic-db-20100204/db/source/printer/HP-DeskJet_1280.xml 2010-04-16 19:08:42.589148242 +0100 @@ -18,6 +18,13 @@ <charset>us-ascii</charset> </text> </lang> + <autodetect> + <usb> + <commandset>MLC,PCL,PML,DESKJET,DW-PCL,DYN</commandset> + <manufacturer>HP</manufacturer> + <model>Deskjet 1280</model> + </usb> + </autodetect> <functionality>A</functionality> <driver>hplip</driver> <comments> diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml --- foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml.device-ids-20100416 2010-04-16 19:07:15.626272889 +0100 +++ foomatic-db-20100204/db/source/printer/HP-DeskJet_D2300.xml 2010-04-16 19:08:42.590147748 +0100 @@ -17,10 +17,9 @@ </lang> <autodetect> <usb> - <commandset>LDL,DYN</commandset> - <description>Deskjet D2300</description> - <manufacturer>hp</manufacturer> - <model>Deskjet D2300</model> + <commandset>LDL</commandset> + <manufacturer>HP</manufacturer> + <model>Deskjet D2300 series</model> </usb> </autodetect> <functionality>B</functionality> diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml --- foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml.device-ids-20100416 2010-04-16 19:07:15.627273338 +0100 +++ foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml 2010-04-16 19:08:42.591148730 +0100 @@ -17,10 +17,9 @@ </lang> <autodetect> <general> - <commandset>LDL,DYN</commandset> - <description>Deskjet F2100</description> - <manufacturer>hp</manufacturer> - <model>Deskjet F2100</model> + <commandset>LDL,MLC,PML,DYN</commandset> + <manufacturer>HP</manufacturer> + <model>Deskjet F2100 series</model> </general> </autodetect> <functionality>B</functionality> diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml --- foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml.device-ids-20100416 2010-04-16 19:07:15.675273282 +0100 +++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml 2010-04-16 19:08:42.593147690 +0100 @@ -19,11 +19,6 @@ </text> </lang> <autodetect> - <general> - <commandset>MLC,PCL,PML,DW-PCL,BIDI-ECP</commandset> - <manufacturer>Hewlett-Packard</manufacturer> - <model>officejet 7300 series</model> - </general> <usb> <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset> <description>6543</description> diff -up foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml --- foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml.device-ids-20100416 2010-04-16 19:07:15.699273421 +0100 +++ foomatic-db-20100204/db/source/printer/HP-PhotoSmart_7400.xml 2010-04-16 19:08:42.595147492 +0100 @@ -20,10 +20,10 @@ </lang> <autodetect> <general> - <commandset>MLC,PCL,PML,DW-PCL,DYN,DESKJET</commandset> - <description>hp photosmart 7400</description> - <manufacturer>hp</manufacturer> - <model>photosmart 7400</model> + <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset> + <description>7450</description> + <manufacturer>HP</manufacturer> + <model>Photosmart 7400 series</model> </general> </autodetect> <functionality>A</functionality> diff -up foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml --- foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml.device-ids-20100416 2010-04-16 19:07:15.690273117 +0100 +++ foomatic-db-20100204/db/source/printer/HP-PSC_2400.xml 2010-04-16 19:08:42.594147569 +0100 @@ -19,12 +19,11 @@ </text> </lang> <autodetect> - <general> - <ieee1284>MFG:Hewlett-Packard;MDL:PSC 2400 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;CLS:PRINTER;</ieee1284> - <commandset>MLC,PCL,PML,DW-PCL,DYN</commandset> - <manufacturer>Hewlett-Packard</manufacturer> - <model>PSC 2400 Series</model> - </general> + <usb> + <commandset>MLC,PCL,PML,DW-PCL</commandset> + <manufacturer>hp</manufacturer> + <model>psc 2400 series</model> + </usb> </autodetect> <functionality>A</functionality> <driver>hplip</driver> diff -up foomatic-db-20100204/db/source/printer/Lexmark-E120.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/Lexmark-E120.xml --- foomatic-db-20100204/db/source/printer/Lexmark-E120.xml.device-ids-20100416 2010-04-16 19:07:15.847272691 +0100 +++ foomatic-db-20100204/db/source/printer/Lexmark-E120.xml 2010-04-16 19:08:42.596147414 +0100 @@ -12,6 +12,14 @@ <lang> <pcl level="5e" /> </lang> + <autodetect> + <usb> + <commandset>NPAP, PJL</commandset> + <description>Lexmark E120</description> + <manufacturer>Lexmark International</manufacturer> + <model>Lexmark E120</model> + </usb> + </autodetect> <functionality>A</functionality> <driver>hpijs-pcl5e</driver> <drivers>