From 6e2a17f8deff984a5e16f8f187d092f70081a1ee Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 6 Dec 2010 15:04:00 +0100 Subject: [PATCH] Device IDs for HP printers - 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) --- foomatic-db-device-ids-20101202.patch | 244 ++++++++++++++++++++++++++ foomatic-db.spec | 17 +- 2 files changed, 260 insertions(+), 1 deletion(-) create mode 100644 foomatic-db-device-ids-20101202.patch diff --git a/foomatic-db-device-ids-20101202.patch b/foomatic-db-device-ids-20101202.patch new file mode 100644 index 0000000..f9857aa --- /dev/null +++ b/foomatic-db-device-ids-20101202.patch @@ -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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL ++ Hewlett-Packard ++ hp color LaserJet 2500 ++ ++ + A + hplip + +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,BIDI-ECP,PCLXL,PCL,PJL,PDF,POSTSCRIPT ++ Hewlett-Packard ++ hp color LaserJet 3700 ++ ++ + A + hplip + +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 @@ + + + +- PJL,MLC,PCL,POSTSCRIPT,PCLXL,P ++ PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL + Hewlett-Packard Color LaserJet 4550 + Hewlett-Packard + HP Color LaserJet 4550 +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT ++ Hewlett-Packard ++ hp color LaserJet 4650 ++ ++ + A + hplip + +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT ++ Hewlett-Packard ++ HP Color LaserJet 4700 ++ ++ + A + hplip + +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT ++ Hewlett-Packard ++ hp color LaserJet 5550 ++ ++ + A + hplip + +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,BIDI-ECP,PJL,PCLXL,PCL,PDF,POSTSCRIPT ++ Hewlett-Packard ++ HP Color LaserJet CM4730 MFP ++ ++ + A + hplip + +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 @@ + + LDL,DYN + Deskjet D4100 +- hp +- Deskjet D4100 ++ HP ++ Deskjet D4100 series + + + B +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 @@ + + + +- ++ + PJL,MLC,PCL,PCLXL,POSTSCRIPT +- Hewlett-Packard LaserJet 4050 Series + Hewlett-Packard + HP LaserJet 4050 Series ++ ++ ++ Hewlett-Packard LaserJet 4050 Series + + + Hewlett-Packard LaserJet 4050 Series INTERFACE=7/1/1 +- HP LaserJet 4050 Series + + + HP LaserJet 4050 Series +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 @@ + + + +- PJL,MLC,PCL,POSTSCRIPT,PCLXL,P ++ PJL,MLC,POSTSCRIPT,PCLXL,PJL,PCL + Hewlett-Packard LaserJet 4100 Series + Hewlett-Packard + HP LaserJet 4100 Series +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 @@ + + + +- +- MFG:HP;MDL:hp LaserJet 4350L; +- HP +- hp LaserJet 4350L +- +- +- PJL,MLC,POSTSCRIPT,PJL,PCLXL,P ++ ++ PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT,PDF + Hewlett-Packard +- hp LaserJet 4300 +- +- +- hp LaserJet 4300 +- ++ hp LaserJet 4350 ++ + + A + hplip +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,PCL,PCLXL,POSTSCRIPT ++ Hewlett-Packard ++ HP LaserJet 5100 Series ++ ++ + A + hplip + +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 @@ + us-ascii + + ++ ++ ++ PJL,MLC,PCL,PCLXL,POSTSCRIPT ++ Hewlett-Packard ++ HP LaserJet 8000 Series ++ ++ + A + hplip + +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 @@ + + + +- +- PJL,MLC,BIDI-ECP,PCL,POSTSCRIP ++ ++ PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL + Hewlett-Packard LaserJet P3005 Series + Hewlett-Packard +- HP LaserJet P3005 Series +- ++ HP LaserJet P3005 ++ + + A + hplip diff --git a/foomatic-db.spec b/foomatic-db.spec index 7d515e3..28c6c6d 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: 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 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 4.0-22.20101123 - Updated to foomatic-db-4.0-20101123 (bug #655238). - Device ID for Canon iR 3225 (bug #651500).