rpms
/
foomatic-db
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- 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).
This commit is contained in:
Tim Waugh 2010-04-16 18:22:39 +00:00
parent 40f5638414
commit e1b5230ced
2 changed files with 221 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
foomatic-db-device-ids-20100416.patch Normal file
View File

@ -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 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,HBP</commandset>
+ <manufacturer>Brother</manufacturer>
+ <model>HL-2140 series</model>
+ </usb>
+ </autodetect>
<functionality>B</functionality>
<driver>hpijs-pcl5e</driver>
<comments>
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 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <general>
+ <commandset>BJ,LQ,BJL,BJRaster</commandset>
+ <manufacturer>Canon</manufacturer>
+ <model>BJC-4100</model>
+ </general>
+ </autodetect>
<functionality>A</functionality>
<driver>bjc600</driver>
<comments>
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_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 @@
</lang>
<autodetect>
<general>
- <commandset>MLC,PCL,PML,DW-PCL,DYN</commandset>
- <manufacturer>Hewlett-Packard</manufacturer>
- <model>OfficeJet 6100 Series</model>
+ <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
+ <manufacturer>HP</manufacturer>
+ <model>Officejet 6100 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>

31
foomatic-db.spec
View File

@ -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 <twaugh@redhat.com> 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 <twaugh@redhat.com> 4.0-13.20100204
- Device IDs for HP PhotoSmart 2570, HP DeskJet 959C and HP OfficeJet
Pro K550 (bug #577280, bug #577293, bug #577296).