From 2b6478c8554189af6c369b2cff6b2cffb99d96ce Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jun 25 2013 08:30:01 +0000
Subject: Merge branch 'f19'


---

diff --git a/cups-libusb-quirks.patch b/cups-libusb-quirks.patch
new file mode 100644
index 0000000..07c76be
--- /dev/null
+++ b/cups-libusb-quirks.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.7b1/backend/usb-libusb.c~ cups-1.7b1/backend/usb-libusb.c
+--- cups-1.7b1/backend/usb-libusb.c~	2013-04-18 15:18:34.000000000 +0100
++++ cups-1.7b1/backend/usb-libusb.c	2013-06-25 09:28:21.325699866 +0100
+@@ -158,6 +158,8 @@ static const struct quirk_printer_struct
+ 			    Printer, https://bugs.launchpad.net/bugs/1032456 */
+ 	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
+ 			    Printer, https://bugs.launchpad.net/bugs/1050009 */
++	{ 0x04a9, 0x1730, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP540
++			    Printer, https://bugzilla.redhat.com/967873 */
+ 	{ 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
+ 			    Printer, http://www.cups.org/str.php?L4155 */
+ 	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
diff --git a/cups.spec b/cups.spec
index 1e57c90..25cd459 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,7 +14,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7
-Release: 0.9.%{prever}%{?dist}
+Release: 0.10.%{prever}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -64,6 +64,7 @@ Patch30: cups-stringpool-setprinterattr.patch
 Patch31: cups-dymo-deviceid.patch
 Patch32: cups-freebind.patch
 Patch33: cups-no-gcry.patch
+Patch34: cups-libusb-quirks.patch
 
 Patch100: cups-lspp.patch
 
@@ -244,6 +245,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch32 -p1 -b .freebind
 # Don't link against libgcrypt needlessly.
 %patch33 -p1 -b .no-gcry
+# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
+%patch34 -p1 -b .libusb-quirks
 
 %if %lspp
 # LSPP support.
@@ -632,6 +635,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Tue Jun 25 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.2-11
+- Added libusb quirk for Canon PIXMA MP540 (bug #967873).
+
 * Mon Jun 24 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.9.b1
 - Don't link against libgcrypt needlessly.