[gutenprint/f14] Added IEEE 1284 Device ID for Canon PIXMA MP250 (bug #744087).

[Tim Waugh]

commit a8513176032449e06a4b9cd9cb06f3b131f8a8e8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 11 11:55:31 2011 +0100

    Added IEEE 1284 Device ID for Canon PIXMA MP250 (bug #744087).

 gutenprint-device-ids.patch |   13 +++++++++++--
 gutenprint.spec             |    6 +++++-
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/gutenprint-device-ids.patch b/gutenprint-device-ids.patch
index 31d63fc..fddbaea 100644
--- a/gutenprint-device-ids.patch
+++ b/gutenprint-device-ids.patch
@@ -1,6 +1,6 @@
 diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/xml/printers.xml
---- gutenprint-5.2.7/src/xml/printers.xml.device-ids	2011-05-01 17:44:04.000000000 +0200
-+++ gutenprint-5.2.7/src/xml/printers.xml	2011-09-27 18:28:25.950428556 +0200
+--- gutenprint-5.2.7/src/xml/printers.xml.device-ids	2011-05-01 16:44:04.000000000 +0100
++++ gutenprint-5.2.7/src/xml/printers.xml	2011-10-11 11:52:59.723682593 +0100
 @@ -137,17 +137,17 @@
        <printer translate="name" name="Canon PIXMA iP1600" driver="bjc-PIXMA-iP1600" manufacturer="Canon" model="3001600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1600" />
        <printer translate="name" name="Canon PIXMA iP1700" driver="bjc-PIXMA-iP1600" manufacturer="Canon" model="3001600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1700" />
@@ -23,6 +23,15 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
        <printer translate="name" name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4300" />
        <printer translate="name" name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4500" />
        <printer translate="name" name="Canon PIXMA iP4600" driver="bjc-PIXMA-iP4600" manufacturer="Canon" model="3004600" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4600" />
+@@ -174,7 +174,7 @@
+       <printer translate="name" name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000170" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP170" />
+       <printer translate="name" name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP180" />
+       <printer translate="name" name="Canon PIXMA MP220" driver="bjc-MULTIPASS-MP220" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP220" />
+-      <printer translate="name" name="Canon PIXMA MP250" driver="bjc-MULTIPASS-MP250" manufacturer="Canon" model="5000250" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP250" />
++      <printer translate="name" name="Canon PIXMA MP250" deviceid="MFG:Canon;CMD:BJL,BJRaster3,BSCCe,IVEC,IVECPLI;MDL:MP250 series;DES:Canon MP250 series;" driver="bjc-MULTIPASS-MP250" manufacturer="Canon" model="5000250" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP250" />
+       <printer translate="name" name="Canon PIXMA MP270" driver="bjc-MULTIPASS-MP270" manufacturer="Canon" model="5000270" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP270" />
+       <printer translate="name" name="Canon PIXMA MP280" driver="bjc-MULTIPASS-MP280" manufacturer="Canon" model="5000280" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP280" />
+       <printer translate="name" name="Canon PIXMA MP360" driver="bjc-MULTIPASS-MP360" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP360" />
 @@ -313,6 +313,7 @@
        <printer translate="name" name="Epson Stylus C86" deviceid="MFG:EPSON;MDL:Stylus C86;DES:EPSON Stylus C86;CMD:ESCPL2,BDC,D4;" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" foomaticid="Epson-Stylus_C86" />
        <printer translate="name" name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" foomaticid="Epson-Stylus_C87" />
diff --git a/gutenprint.spec b/gutenprint.spec
index 099da38..f523a28 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -3,7 +3,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.2.7
-Release:        5%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:	http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2
@@ -170,6 +170,7 @@ Epson, HP and compatible printers.
 #  HP LaserJet 4050/4100/4350/5100/8000/M3027 MFP/M3035 MFP/P3005 (bug #659043).
 #  HP Color LaserJet 2500/4550 (bug #659044).
 #  Brother hl-2035 (bug #651603#c3)
+#  Canon PIXMA MP250 (bug #744087).
 %patch4 -p1 -b .device-ids
 # Avoid null pointer access in escputil (bug #659120).
 %patch5 -p1 -b .null-pointer
@@ -304,6 +305,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Oct 11 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-7
+- Added IEEE 1284 Device ID for Canon PIXMA MP250 (bug #744087).
+
 * Tue Sep 27 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-5
 - Use _cups_serverbin macro from cups-devel for where to put driver executables.
 - Added IEEE 1284 Device ID for: