rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f18' into f19

Browse Source
This commit is contained in:
Tim Waugh 2013-06-25 09:26:26 +01:00
commit 8e3d134a89
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cups-usblp-quirks.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c diff -up cups-1.6.2/backend/usb-libusb.c.usblp-quirks cups-1.6.2/backend/usb-libusb.c
--- cups-1.6.2/backend/usb-libusb.c.quirks 2013-03-14 15:31:07.000000000 +0100 --- cups-1.6.2/backend/usb-libusb.c.usblp-quirks 2013-03-14 14:31:07.000000000 +0000
+++ cups-1.6.2/backend/usb-libusb.c 2013-05-23 10:44:34.456769834 +0200 +++ cups-1.6.2/backend/usb-libusb.c 2013-06-25 09:25:35.941884975 +0100
@@ -142,8 +142,12 @@ static const struct quirk_printer_struct @@ -142,8 +142,12 @@ static const struct quirk_printer_struct
{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
@ -14,7 +14,13 @@ diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c
{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
Printer, http://www.cups.org/str.php?L4155 */ Printer, http://www.cups.org/str.php?L4155 */
{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
@@ -158,6 +162,8 @@ static const struct quirk_printer_struct @@ -154,10 +158,14 @@ 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 */ Printer, http://www.cups.org/str.php?L4155 */
{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
Printer, http://www.cups.org/str.php?L4155 */ Printer, http://www.cups.org/str.php?L4155 */
@ -23,7 +29,7 @@ diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c
{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
HL-1430 Laser Printer, HL-1430 Laser Printer,
https://bugs.launchpad.net/bugs/1038695 */ https://bugs.launchpad.net/bugs/1038695 */
@@ -165,24 +171,33 @@ static const struct quirk_printer_struct @@ -165,24 +173,33 @@ static const struct quirk_printer_struct
USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
HL-1440 Laser Printer, HL-1440 Laser Printer,
https://bugs.launchpad.net/bugs/1000253 */ https://bugs.launchpad.net/bugs/1000253 */

8
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.6.2 Version: 1.6.2
Release: 10%{?dist} Release: 11%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -230,7 +230,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch27 -p1 -b .avahi-address %patch27 -p1 -b .avahi-address
# More USB quirks for the libusb-based backend (STR #4311). # More USB quirks for the libusb-based backend (STR #4311).
# Fixed in 1.6.3 # Fixed in 1.6.3
%patch28 -p1 -b .quirks # Added usblp quirk for Canon PIXMA MP540 (bug #967873).
%patch28 -p1 -b .usblp-quirks
# Return from cupsEnumDests() once all records have been returned. # Return from cupsEnumDests() once all records have been returned.
%patch29 -p1 -b .enum-all %patch29 -p1 -b .enum-all
# Prevent stringpool damage leading to memory leaks (bug #974048). # Prevent stringpool damage leading to memory leaks (bug #974048).
@ -638,6 +639,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Jun 25 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.2-11
- Added usblp quirk for Canon PIXMA MP540 (bug #967873).
* Tue Jun 18 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.2-10 * Tue Jun 18 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.2-10
- Added IEEE 1284 Device ID for a Dymo device (bug #747866). - Added IEEE 1284 Device ID for a Dymo device (bug #747866).