diff -Nru cups-1.5.0/debian/changelog cups-1.5.0/debian/changelog --- cups-1.5.0/debian/changelog 2011-10-07 17:58:16.000000000 +0200 +++ cups-1.5.0/debian/changelog 2011-10-11 23:33:02.000000000 +0200 @@ -1,3 +1,13 @@ +cups (1.5.0-8ubuntu2) oneiric-proposed; urgency=low + + * debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch: + CUPS adds the option setting "AP_D_InputSlot=" to every job. This overrides + the InputSlot option and so the InputSlot setting and even the default + setting for InputSlot in the PPD get never used, rendering InputSlot + useless (LP: #872527). + + -- Till Kamppeter Tue, 11 Oct 2011 23:32:43 +0200 + cups (1.5.0-8ubuntu1) oneiric-proposed; urgency=low [ Till Kamppeter ] diff -Nru cups-1.5.0/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch cups-1.5.0/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch --- cups-1.5.0/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch 1970-01-01 01:00:00.000000000 +0100 +++ cups-1.5.0/debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch 2011-10-11 23:31:06.000000000 +0200 @@ -0,0 +1,14 @@ +--- a/cups/mark.c ++++ b/cups/mark.c +@@ -788,6 +788,11 @@ + + if (!_cups_strcasecmp(option, "AP_D_InputSlot")) + { ++ /* CUPS adds AP_D_InputSlot to all jobs, if not explicitly set with ++ empty argument, making the InputSlot option useless. So ignore it ++ if the argument is empty. */ ++ if (choice[0] == '\0') return; ++ + cupsArraySave(ppd->options); + + if ((o = ppdFindOption(ppd, "InputSlot")) != NULL) diff -Nru cups-1.5.0/debian/patches/series cups-1.5.0/debian/patches/series --- cups-1.5.0/debian/patches/series 2011-10-07 17:56:48.000000000 +0200 +++ cups-1.5.0/debian/patches/series 2011-10-11 23:30:53.000000000 +0200 @@ -25,6 +25,7 @@ cups-deviced-allow-device-ids-with-newline.patch cups-snmp-oids-device-id-hp-ricoh.patch configure-default-browse-protocols.patch +do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch # Debian patches logfiles_adm_readable.patch