diff --git a/foomatic-db-device-ids-20100416.patch b/foomatic-db-device-ids-20100416.patch
new file mode 100644
index 0000000..44bc7c6
--- /dev/null
+++ b/foomatic-db-device-ids-20100416.patch
@@ -0,0 +1,191 @@
+diff -U0 foomatic-db-20100204/ChangeLog.device-ids-20100416 foomatic-db-20100204/ChangeLog
+diff -up foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml
+--- foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml.device-ids-20100416 2010-04-16 19:07:14.770273169 +0100
++++ foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml 2010-04-16 19:08:42.567147839 +0100
+@@ -19,6 +19,13 @@
+ us-ascii
+
+
++
++
++ PJL,HBP
++ Brother
++ HL-2140 series
++
++
+ B
+ hpijs-pcl5e
+
+diff -up foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml
+--- foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml.device-ids-20100416 2010-04-16 19:07:14.794273136 +0100
++++ foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml 2010-04-16 19:08:42.568147973 +0100
+@@ -18,6 +18,13 @@
+ us-ascii
+
+
++
++
++ BJ,LQ,BJL,BJRaster
++ Canon
++ BJC-4100
++
++
+ A
+ bjc600
+
+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 @@
+ us-ascii
+
+
++
++
++ PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT
++ Hewlett-Packard
++ HP Color LaserJet 3800
++
++
+ A
+ hplip
+
+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 @@
+ us-ascii
+
+
++
++
++ MLC,PCL,PML,DESKJET,DW-PCL,DYN
++ HP
++ Deskjet 1280
++
++
+ A
+ hplip
+
+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 @@
+
+
+
+- LDL,DYN
+- Deskjet D2300
+- hp
+- Deskjet D2300
++ LDL
++ HP
++ Deskjet D2300 series
+
+
+ B
+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 @@
+
+
+
+- LDL,DYN
+- Deskjet F2100
+- hp
+- Deskjet F2100
++ LDL,MLC,PML,DYN
++ HP
++ Deskjet F2100 series
+
+
+ B
+diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml
+--- foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100416 2010-04-16 19:07:15.671273689 +0100
++++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml 2010-04-16 19:08:42.592147514 +0100
+@@ -19,9 +19,9 @@
+
+
+
+- MLC,PCL,PML,DW-PCL,DYN
+- Hewlett-Packard
+- OfficeJet 6100 Series
++ MLC,PCL,PML,DW-PCL,DESKJET,DYN
++ HP
++ Officejet 6100 series
+
+
+ B
+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 @@
+
+
+
+-
+- MLC,PCL,PML,DW-PCL,BIDI-ECP
+- Hewlett-Packard
+- officejet 7300 series
+-
+
+ MLC,PCL,PML,DW-PCL,DESKJET,DYN
+ 6543
+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 @@
+
+
+
+- MLC,PCL,PML,DW-PCL,DYN,DESKJET
+- hp photosmart 7400
+- hp
+- photosmart 7400
++ MLC,PCL,PML,DW-PCL,DESKJET,DYN
++ 7450
++ HP
++ Photosmart 7400 series
+
+
+ A
+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 @@
+
+
+
+-
+- MFG:Hewlett-Packard;MDL:PSC 2400 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;CLS:PRINTER;
+- MLC,PCL,PML,DW-PCL,DYN
+- Hewlett-Packard
+- PSC 2400 Series
+-
++
++ MLC,PCL,PML,DW-PCL
++ hp
++ psc 2400 series
++
+
+ A
+ hplip
+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 @@
+
+
+
++
++
++ NPAP, PJL
++ Lexmark E120
++ Lexmark International
++ Lexmark E120
++
++
+ A
+ hpijs-pcl5e
+
diff --git a/foomatic-db.spec b/foomatic-db.spec
index 27d72f1..2f79560 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -5,7 +5,7 @@
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
-Release: 13.%{dbver_snap}%{?dist}
+Release: 14.%{dbver_snap}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Requires: %{name}-filesystem = %{version}-%{release}
@@ -17,6 +17,7 @@ Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijs
Patch1: foomatic-db-device-id-kyocera-mita-fs-1020d.patch
Patch2: foomatic-db-bad-margins.patch
Patch3: foomatic-db-device-id-hp-ps2570-dj959c-ojpk550.patch
+Patch4: foomatic-db-device-ids-20100416.patch
Url: http://www.openprinting.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,6 +108,20 @@ popd
# Pro K550 (bug #577280, bug #577293, bug #577296).
%patch3 -p1 -b .device-id-hp-ps2570-dj959c-ojpk550.patch
+# Device IDs for:
+# - Canon BJC-4100 (bug #583060)
+# - HP Color LaserJet 3800 (bug #581936).
+# - HP DeskJet D2300 (bug #580341).
+# - HP DeskJet F2100 (bug #579245).
+# - HP OfficeJet 7300 (bug #577897).
+# - Lexmark E120 (bug #577881).
+# - HP DeskJet 1280 (bug #577870).
+# - HP PhotoSmart 7400 (bug #577866).
+# - Brother HL-2140 (bug #577863).
+# - HP OfficeJet 6200 (bug #215063).
+# - HP PSC 2400 (bug #188419).
+%patch4 -p1 -b .device-ids-20100416.patch
+
popd
%build
@@ -173,6 +188,20 @@ rm -rf %{buildroot}
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
+* Fri Apr 16 2010 Tim Waugh 4.0-14.20100204
+- Device IDs for:
+ - Canon BJC-4100 (bug #583060)
+ - HP Color LaserJet 3800 (bug #581936).
+ - HP DeskJet D2300 (bug #580341).
+ - HP DeskJet F2100 (bug #579245).
+ - HP OfficeJet 7300 (bug #577897).
+ - Lexmark E120 (bug #577881).
+ - HP DeskJet 1280 (bug #577870).
+ - HP PhotoSmart 7400 (bug #577866).
+ - Brother HL-2140 (bug #577863).
+ - HP OfficeJet 6200 (bug #215063).
+ - HP PSC 2400 (bug #188419).
+
* Fri Mar 26 2010 Tim Waugh 4.0-13.20100204
- Device IDs for HP PhotoSmart 2570, HP DeskJet 959C and HP OfficeJet
Pro K550 (bug #577280, bug #577293, bug #577296).