Merge branch 'f13' into f14

.gitignore

@@ -5,3 +5,4 @@ foomatic-db-4.0-20091126.tar.gz
 foomatic-db-4.0-20100204.tar.gz
 /foomatic-db-4.0-20100819.tar.gz
 /foomatic-db-hpijs-20090901.tar.gz
+/foomatic-db-4.0-20101123.tar.gz

foomatic-db-device-ids-20101123.patch

@@ -0,0 +1,17 @@
+diff -up foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml.device-ids-20101123 foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml
+--- foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml.device-ids-20101123	2010-11-23 16:27:55.000000000 +0100
++++ foomatic-db-20101123/db/source/printer/Canon-imageRunner_3225.xml	2010-11-23 17:57:10.000000000 +0100
+@@ -5,6 +5,13 @@
+     <postscript level="3" />
+     <pcl level="6" />
+   </lang>
++  <autodetect>
++    <usb>
++      <commandset>LIPSLX,PS,PostScript,PCL,PJL,CPCA,1284.4-2000</commandset>
++      <manufacturer>Canon</manufacturer>
++      <model>iR3225 (UFR II)</model>
++    </usb>
++  </autodetect>
+   <functionality>B</functionality>
+   <driver>pxlmono</driver>
+   <drivers>

foomatic-db.spec

@@ -1,11 +1,11 @@
 %define dbver_rel 4.0
-%define dbver_snap 20100819
+%define dbver_snap 20101123
 %define hpijsver 20090901
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 21.%{dbver_snap}%{?dist}
+Release: 22.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -16,6 +16,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
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -110,6 +111,10 @@ popd
 # - Ricoh Aficio SP C420DN (bug #589533).
 %patch2 -p1
 
+# Device IDs for:
+# - Canon iR 3225 (bug #651500).
+%patch3 -p1
+
 # 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,'
 
@@ -179,6 +184,10 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* 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).
+
 * Wed Nov 03 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-21.20100819
 - Remove wrong Device ID for Canon iR 3170C (bug #617493).
 

sources

@@ -1,2 +1,2 @@
-0ed5d8d37cb80defa720aef07af07e1e  foomatic-db-4.0-20100819.tar.gz
 beb05c3a335e8a1e5aea5a030badc35d  foomatic-db-hpijs-20090901.tar.gz
+37fc61facd0582bae501ec7d0977420a  foomatic-db-4.0-20101123.tar.gz