Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package cups This upload fixes the following bugs: * #700961 "AirPrint doesn't work on iOS 6 device". RC because it's a regression from Squeeze. RC because it's a regression from Squeeze. Also "nice to have for a Debian stable". * #697970 "printing gets wrong after some pages on Epson Stylus Photo 750". Important to have reliable printing on that printer. Here's the changelog: cups (1.5.3-2.15) unstable; urgency=low . [ Till Kamppeter ] * Update airprint-support.patch to make AirPrint support also work for iOS 6. (Closes: #700961, LP: #1054495) - thanks to Jan Wagner. . [ Didier Raboud ] * Add usb-backend quirk for Epson Stylus Photo 750 (Closes: #697970) And the full debdiff is attached. Cheers, OdyX unblock cups/1.5.3-2.15
diff -Nru cups-1.5.3/debian/changelog cups-1.5.3/debian/changelog --- cups-1.5.3/debian/changelog 2013-01-20 17:20:15.000000000 +0100 +++ cups-1.5.3/debian/changelog 2013-02-27 12:59:38.000000000 +0100 @@ -1,3 +1,14 @@ +cups (1.5.3-2.15) unstable; urgency=low + + [ Till Kamppeter ] + * Update airprint-support.patch to make AirPrint support also work for + iOS 6. (Closes: #700961, LP: #1054495) - thanks to Jan Wagner. + + [ Didier Raboud ] + * Add usb-backend quirk for Epson Stylus Photo 750 (Closes: #697970) + + -- Didier Raboud <o...@debian.org> Wed, 27 Feb 2013 12:59:30 +0100 + cups (1.5.3-2.14) unstable; urgency=low * Add upstream patch to avoid using Kerberos over the local socket. diff -Nru cups-1.5.3/debian/patches/airprint-support.patch cups-1.5.3/debian/patches/airprint-support.patch --- cups-1.5.3/debian/patches/airprint-support.patch 2013-01-20 17:20:11.000000000 +0100 +++ cups-1.5.3/debian/patches/airprint-support.patch 2013-02-20 12:59:47.000000000 +0100 @@ -1,6 +1,9 @@ Description: Add-on to cups-avahi.patch to support Apple AirPrint (printing from iPhone, iPad, iPod Touch to a CUPS server), patch is separate as this part is not in the upstream repository of cups-avahi.patch because it is not intencded to be submitted to CUPS upstream. Author: Till Kamppeter <till.kamppe...@gmail.com> Bug: https://bugs.launchpad.net/bugs/711779 +Bug: https://bugs.launchpad.net/bugs/1054495 +Bug-Debian: http://bugs.debian.org/700961 +Last-Update: 2013-02-20 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -15,13 +18,53 @@ cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c -@@ -2522,6 +2522,9 @@ +@@ -2522,6 +2522,12 @@ keyvalue[i ][0] = "pdl"; keyvalue[i++][1] = p->pdl ? p->pdl : "application/postscript"; ++ /* iOS 6 does not accept this printer as AirPrint printer if there is ++ no URF txt record or "URF=none", "DM3" is the minimum needed found ++ by try and error */ + keyvalue[i ][0] = "URF"; -+ keyvalue[i++][1] = "none"; ++ keyvalue[i++][1] = "DM3"; + if (get_auth_info_required(p, air_str, sizeof(air_str))) { keyvalue[i ][0] = "air"; +--- a/conf/mime.convs.in ++++ b/conf/mime.convs.in +@@ -86,6 +86,9 @@ + # PWG Raster filter for IPP Everywhere... + application/vnd.cups-raster image/pwg-raster 100 rastertopwg + ++# Needed for printing from iOS (AirPrint) clients ++image/urf application/pdf 100 - ++ + ######################################################################## + # + # Raw filter... +--- a/conf/mime.types ++++ b/conf/mime.types +@@ -110,6 +110,9 @@ + image/x-bitmap bmp string(0,BM) + !printable(2,14) + image/x-icon ico + ++# Needed for printing from iOS (AirPrint) clients ++image/urf urf string(0,UNIRAST<00>) ++ + ######################################################################## + # + # Text files... +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -3908,7 +3908,9 @@ + } + else if (!_cups_strcasecmp(type->super, "image")) + { +- if (!_cups_strcasecmp(type->type, "jpeg")) ++ if (!_cups_strcasecmp(type->type, "urf")) ++ strlcat(pdl, "image/urf,", sizeof(pdl)); ++ else if (!_cups_strcasecmp(type->type, "jpeg")) + strlcat(pdl, "image/jpeg,", sizeof(pdl)); + else if (!_cups_strcasecmp(type->type, "png")) + strlcat(pdl, "image/png,", sizeof(pdl)); diff -Nru cups-1.5.3/debian/patches/series cups-1.5.3/debian/patches/series --- cups-1.5.3/debian/patches/series 2013-01-20 17:20:15.000000000 +0100 +++ cups-1.5.3/debian/patches/series 2013-02-27 12:58:19.000000000 +0100 @@ -45,6 +45,7 @@ dnssd-reg-array-linear-search.patch upstream-backport-of-libusb-quirks.patch usb-backend-xerox-3124.patch +usb-backend-epson-stylus-photo-750.patch tests-ignore-warnings.patch tests-ignore-usb-crash.patch test-i18n-nonlinux.patch diff -Nru cups-1.5.3/debian/patches/usb-backend-epson-stylus-photo-750.patch cups-1.5.3/debian/patches/usb-backend-epson-stylus-photo-750.patch --- cups-1.5.3/debian/patches/usb-backend-epson-stylus-photo-750.patch 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.3/debian/patches/usb-backend-epson-stylus-photo-750.patch 2013-02-24 16:32:09.000000000 +0100 @@ -0,0 +1,16 @@ +Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others) +Author: Didier Raboud <o...@debian.org> +Bugs-Debian: http://bugs.debian.org/697970 +Last-Update: 2013-02-14 + +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -167,6 +167,8 @@ + https://bugs.launchpad.net/bugs/872483 */ + { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, + https://bugs.launchpad.net/bugs/872483 */ ++ { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, ++ http://bugs.debian.org/697970 */ + { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt + Printer M129C */ + { 0x067b, 0x2305, USBLP_QUIRK_BIDIR |