Removed printers/drivers conflicting with foo2xxx (bug #625505).
This commit is contained in:
Jiri Popelka
parent
5fec398b9b
commit
3571147885
|
|
@ -1,7 +1,7 @@
|
|||
diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd
|
||||
--- foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 2010-05-06 14:13:12.956050897 +0100
|
||||
+++ foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd 2010-05-06 14:13:27.625050334 +0100
|
||||
@@ -41,6 +41,7 @@
|
||||
diff -up foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd
|
||||
--- foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 2010-08-19 09:41:02.000000000 +0200
|
||||
+++ foomatic-db-20100819/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd 2010-08-20 19:03:39.000000000 +0200
|
||||
@@ -42,6 +42,7 @@
|
||||
*PSVersion: "(3017.104) 2"
|
||||
*ShortNickName: "Ricoh Aficio SP C420DN PS"
|
||||
*NickName: "Ricoh Aficio SP C420DN PS"
|
||||
|
|
@ -9,63 +9,10 @@ diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.p
|
|||
|
||||
*%PNP_NAME: "Aficio SP C420DN"
|
||||
*%LOADDLL_NAME32: "MFRICRES.dll"
|
||||
@@ -1628,4 +1629,4 @@ cleartomark\n"
|
||||
@@ -1629,4 +1630,4 @@ cleartomark\n"
|
||||
*CloseGroup: JobLog/Job Log
|
||||
|
||||
|
||||
-*% end of Printer Description file
|
||||
\ No newline at end of file
|
||||
+*% end of Printer Description file
|
||||
diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml
|
||||
--- foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.device-ids-20100506 2010-05-06 14:13:27.638050300 +0100
|
||||
+++ foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml 2010-05-06 14:13:27.638050300 +0100
|
||||
@@ -0,0 +1,49 @@
|
||||
+<printer id="printer/HP-Color_LaserJet_2605dn">
|
||||
+ <make>HP</make>
|
||||
+ <model>Color LaserJet 2605dn</model>
|
||||
+ <mechanism>
|
||||
+ <laser />
|
||||
+ <color />
|
||||
+ <resolution>
|
||||
+ <dpi>
|
||||
+ <x>600</x>
|
||||
+ <y>600</y>
|
||||
+ </dpi>
|
||||
+ </resolution>
|
||||
+ </mechanism>
|
||||
+ <url>http://www.hp.com/</url>
|
||||
+ <lang>
|
||||
+ <postscript level="3" />
|
||||
+ <pcl level="6" />
|
||||
+ <pjl />
|
||||
+ <text>
|
||||
+ <charset>us-ascii</charset>
|
||||
+ </text>
|
||||
+ </lang>
|
||||
+ <autodetect>
|
||||
+ <general>
|
||||
+ <commandset>JL,PML,POSTSCRIPT,PCLXL,PCL</commandset>
|
||||
+ <manufacturer>Hewlett-Packard</manufacturer>
|
||||
+ <model>HP Color LaserJet 2605dn</model>
|
||||
+ </general>
|
||||
+ </autodetect>
|
||||
+ <functionality>A</functionality>
|
||||
+ <driver>hplip</driver>
|
||||
+ <drivers>
|
||||
+ <driver>
|
||||
+ <id>hplip</id>
|
||||
+ </driver>
|
||||
+ </drivers>
|
||||
+ <comments>
|
||||
+ <en>
|
||||
+
|
||||
+ For basic printing functionality use the Postscript PPD. For advanced functionality such
|
||||
+ as printer status and maintenance features, use the
|
||||
+ <a href="http://hplipopensource.com/">
|
||||
+ HPLIP driver</a> (which includes HPIJS). <p><p>
|
||||
+
|
||||
+ Consumables/Refills: 1 toner cartridge for each color, imaging drum<p>
|
||||
+
|
||||
+ </en>
|
||||
+ </comments>
|
||||
+</printer>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
Summary: Database of printers and printer drivers
|
||||
Name: foomatic-db
|
||||
Version: %{dbver_rel}
|
||||
Release: 19.%{dbver_snap}%{?dist}
|
||||
Release: 20.%{dbver_snap}%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}-filesystem = %{version}-%{release}
|
||||
|
|
@ -70,10 +70,12 @@ pushd db/source
|
|||
# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
|
||||
perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml
|
||||
|
||||
# Remove Samsung-CLP-300, Samsung-CLP-315 (bug #625505)
|
||||
find printer -name '*.xml' |grep -E 'Samsung-CLP-300|Samsung-CLP-315'|xargs rm -vf
|
||||
# Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
|
||||
# Also foo2lava, foo2kyo, foo2xqx (bug #438319).
|
||||
# Also foo2slx and foo2hiperc (bug #518267).
|
||||
for x in zjs oak hp qpdl lava kyo xqx slx hiperc
|
||||
for x in zjs oak oak-z1 hp qpdl lava kyo xqx slx hiperc
|
||||
do
|
||||
find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
|
||||
rm -f driver/foo2${x}.xml opt/foo2${x}-*
|
||||
|
|
@ -106,7 +108,6 @@ popd
|
|||
%patch1 -p1 -b .device-ids-20100416
|
||||
|
||||
# Device IDs for:
|
||||
# - HP Color LaserJet 2605dn (bug #583909).
|
||||
# - Ricoh Aficio SP C420DN (bug #589533).
|
||||
%patch2 -p1
|
||||
|
||||
|
|
@ -182,6 +183,10 @@ rm -rf %{buildroot}
|
|||
%{_datadir}/cups/model/foomatic-db-ppds
|
||||
|
||||
%changelog
|
||||
* Fri Aug 20 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-20.20100819
|
||||
- Removed printer/Samsung-CLP-300|315.xml (bug #625505).
|
||||
- Removed references to foo2oak-z1.
|
||||
|
||||
* Thu Aug 19 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-19.20100819
|
||||
- Updated to foomatic-db-4.0-20100819, foomatic-db-hpijs-20090901.tar.gz
|
||||
- Device ID for Canon iR 3170C (bug #617493).
|
||||
|
|
|
|||
Loading…
Reference in New Issue