summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2014-09-22 18:01:19 +0200
committerDidier Raboud <odyx@debian.org>2014-09-22 18:01:56 +0200
commitc9945caa5e08ca95506e970827b709c704b8d02f (patch)
tree8a95b939dce682b0dcf9f6957ffd14987a148b3f /debian
parent94815d2032735cbe3428958ea8f762cdac59e27f (diff)
downloadcups-c9945caa5e08ca95506e970827b709c704b8d02f.tar.gz
Add two USB quirk fixes for Canon MX310 and MX320 printers
LP: #1346868 LP: #1369547
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/canon-mx3x0-quirks.patch27
-rw-r--r--debian/patches/series1
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/canon-mx3x0-quirks.patch b/debian/patches/canon-mx3x0-quirks.patch
new file mode 100644
index 00000000..3e082254
--- /dev/null
+++ b/debian/patches/canon-mx3x0-quirks.patch
@@ -0,0 +1,27 @@
+Description: Add two USB quirk fixes for Canon MX310 and MX320 printers
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1346868
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1369547
+Bug: http://cups.org/str.php?L4482
+Last-Update: 2014-09-21
+--- a/backend/org.cups.usb-quirks
++++ b/backend/org.cups.usb-quirks
+@@ -75,12 +75,18 @@
+ # Canon, Inc. MP510 Printer, https://bugs.launchpad.net/bugs/1050009
+ 0x04a9 0x1717 unidir
+
++# Canon, Inc. MX310 Printer, https://bugs.launchpad.net/bugs/1346868
++0x04a9 0x1728 unidir
++
+ # Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155
+ 0x04a9 0x173d unidir
+
+ # Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155
+ 0x04a9 0x173e unidir
+
++# Canon, Inc. MX320 Printer, https://bugs.launchpad.net/bugs/1369547
++0x04a9 0x1736 unidir
++
+ # Canon, Inc. MF4150 Printer, https://bugs.launchpad.net/bugs/1160638
+ 0x04a9 0x26a3 no-reattach
+
diff --git a/debian/patches/series b/debian/patches/series
index db9a75e8..dd701c5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ rootbackends-worldreadable.patch
fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
cupsd-idleexittimeout.patch
cups-no-gcrypt.patch
+canon-mx3x0-quirks.patch
# patches which should go upstream
color-management-extension.patch