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

Merge branch 'f13' into f14

Browse Source
This commit is contained in:
Jiri Popelka 2010-12-06 15:05:58 +01:00
commit df54ddc6c1
2 changed files with 260 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
foomatic-db-device-ids-20101202.patch Normal file
View File

@ -0,0 +1,244 @@
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 2500</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PJL,PDF,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 3700</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml 2010-12-02 16:08:58.000000000 +0100
@@ -22,7 +22,7 @@
</lang>
<autodetect>
<parallel>
- <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,P</commandset>
+ <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL</commandset>
<description>Hewlett-Packard Color LaserJet 4550</description>
<manufacturer>Hewlett-Packard</manufacturer>
<model>HP Color LaserJet 4550</model>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 4650</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml 2010-12-02 16:00:22.000000000 +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 4700</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml 2010-12-02 16:11:41.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>hp color LaserJet 5550</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,PJL,PCLXL,PCL,PDF,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP Color LaserJet CM4730 MFP</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml
--- foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml 2010-12-02 16:00:22.000000000 +0100
@@ -19,8 +19,8 @@
<usb>
<commandset>LDL,DYN</commandset>
<description>Deskjet D4100</description>
- <manufacturer>hp</manufacturer>
- <model>Deskjet D4100</model>
+ <manufacturer>HP</manufacturer>
+ <model>Deskjet D4100 series</model>
</usb>
</autodetect>
<functionality>B</functionality>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml 2010-12-02 16:05:27.000000000 +0100
@@ -20,15 +20,16 @@
</text>
</lang>
<autodetect>
- <parallel>
+ <general>
<commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
- <description>Hewlett-Packard LaserJet 4050 Series</description>
<manufacturer>Hewlett-Packard</manufacturer>
<model>HP LaserJet 4050 Series</model>
+ </general>
+ <parallel>
+ <description>Hewlett-Packard LaserJet 4050 Series</description>
</parallel>
<usb>
<description>Hewlett-Packard LaserJet 4050 Series INTERFACE=7/1/1</description>
- <model>HP LaserJet 4050 Series</model>
</usb>
<snmp>
<description>HP LaserJet 4050 Series</description>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml 2010-12-02 16:06:15.000000000 +0100
@@ -21,7 +21,7 @@
</lang>
<autodetect>
<parallel>
- <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,P</commandset>
+ <commandset>PJL,MLC,POSTSCRIPT,PCLXL,PJL,PCL</commandset>
<description>Hewlett-Packard LaserJet 4100 Series</description>
<manufacturer>Hewlett-Packard</manufacturer>
<model>HP LaserJet 4100 Series</model>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml 2010-12-02 16:00:22.000000000 +0100
@@ -19,19 +19,11 @@
</text>
</lang>
<autodetect>
- <general>
- <ieee1284>MFG:HP;MDL:hp LaserJet 4350L;</ieee1284>
- <manufacturer>HP</manufacturer>
- <model>hp LaserJet 4350L</model>
- </general>
- <parallel>
- <commandset>PJL,MLC,POSTSCRIPT,PJL,PCLXL,P</commandset>
+ <usb>
+ <commandset>PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT,PDF</commandset>
<manufacturer>Hewlett-Packard</manufacturer>
- <model>hp LaserJet 4300</model>
- </parallel>
- <snmp>
- <description>hp LaserJet 4300</description>
- </snmp>
+ <model>hp LaserJet 4350</model>
+ </usb>
</autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml 2010-12-02 16:00:22.000000000 +0100
@@ -19,6 +19,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet 5100 Series</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml 2010-12-02 16:00:22.000000000 +0100
@@ -18,6 +18,13 @@
<charset>us-ascii</charset>
</text>
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet 8000 Series</model>
+ </usb>
+ </autodetect>
<functionality>A</functionality>
<driver>hplip</driver>
<drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml.device-ids-20101202 2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml 2010-12-02 16:00:22.000000000 +0100
@@ -20,12 +20,12 @@
</text>
</lang>
<autodetect>
- <general>
- <commandset>PJL,MLC,BIDI-ECP,PCL,POSTSCRIP</commandset>
+ <usb>
+ <commandset>PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
<description>Hewlett-Packard LaserJet P3005 Series</description>
<manufacturer>Hewlett-Packard</manufacturer>
- <model>HP LaserJet P3005 Series</model>
- </general>
+ <model>HP LaserJet P3005</model>
+ </usb>
</autodetect>
<functionality>A</functionality>
<driver>hplip</driver>

17
foomatic-db.spec
View File

@ -5,7 +5,7 @@
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 22.%{dbver_snap}%{?dist}
Release: 23.%{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/oldstuff/foomatic-db-hpij
Patch1: foomatic-db-device-ids-20100416.patch
Patch2: foomatic-db-device-ids-20100506.patch
Patch3: foomatic-db-device-ids-20101123.patch
Patch4: foomatic-db-device-ids-20101202.patch
Url: http://www.openprinting.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -115,6 +116,13 @@ popd
# - Canon iR 3225 (bug #651500).
%patch3 -p1
# Device IDs for:
# HP Deskjet D4100 (bug #658091)
# HP Color LaserJet CM4730 MFP (bug #658838)
# HP LaserJet 4050/4100/4350/5100/8000/P3005 (bug #659041)
# HP Color LaserJet 2500/3700/4550/4650/4700/5550 (bug #659042)
%patch4 -p1 -b .device-ids-20101202
# Use sed instead of perl in the PPDs (bug #512739).
find db/source/PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
@ -184,6 +192,13 @@ rm -rf %{buildroot}
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
* Mon Dec 06 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-23.20101123
- Device IDs for:
- HP Deskjet D4100 (bug #658091)
- HP Color LaserJet CM4730 MFP (bug #658838)
- HP LaserJet 4050/4100/4350/5100/8000/P3005 (bug #659041)
- HP Color LaserJet 2500/3700/4550/4650/4700/5550 (bug #659042)
* Tue Nov 23 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-22.20101123
- Updated to foomatic-db-4.0-20101123 (bug #655238).
- Device ID for Canon iR 3225 (bug #651500).