[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10859 - in branches/branch-1.6: . backend
From:       cups-dev () easysw ! com
Date:       2013-02-04 16:53:14
Message-ID: 11629-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2013-02-04 08:53:04 -0800 (Mon, 04 Feb 2013)
New Revision: 10859
Log:
Mirror USB quirks from trunk (STR #4263)


Modified:
   branches/branch-1.6/CHANGES.txt
   branches/branch-1.6/backend/usb-libusb.c

Modified: branches/branch-1.6/CHANGES.txt
===================================================================
--- branches/branch-1.6/CHANGES.txt	2013-02-04 16:52:43 UTC (rev 10858)
+++ branches/branch-1.6/CHANGES.txt	2013-02-04 16:53:04 UTC (rev 10859)
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.6.2 - 2013-01-21
+CHANGES.txt - 1.6.2 - 2013-02-04
 --------------------------------
 
 
@@ -15,7 +15,8 @@
 	- Updated the Catalan localization (STR #4202)
 	- The lp command did not show errors for unknown "--foo" (STR #4261)
 	- Bad IPP responses could crash ipptool (STR #4262)
-	- Added a USB quirk rule for Xerox Phaser 3124 printers (STR #4217)
+	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,
+	  STR #4263)
 	- Added USB blacklisting for printers that require a custom backend
 	  (STR #4218)
 	- The PPD compiler did not correctly JCL options (STR #4115, STR #4203)

Modified: branches/branch-1.6/backend/usb-libusb.c
===================================================================
--- branches/branch-1.6/backend/usb-libusb.c	2013-02-04 16:52:43 UTC (rev 10858)
+++ branches/branch-1.6/backend/usb-libusb.c	2013-02-04 16:53:04 UTC (rev 10859)
@@ -148,6 +148,8 @@
 			    Printer, http://www.cups.org/str.php?L4155 */
 	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
 			    Printer, https://bugs.launchpad.net/bugs/1032385 */
+	{ 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
+		      https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
 	{ 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
 			    Printer, https://bugs.launchpad.net/bugs/1032456 */
 	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
@@ -175,6 +177,8 @@
 	                  USBLP_QUIRK_RESET },
 	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
 			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
+	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
+				     https://bugs.launchpad.net/bugs/1102470 */
 	/* Prolific Technology, Inc. PL2305 Parallel Port
 	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
 	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]