diff -u cupsys-1.2.2/debian/changelog cupsys-1.2.2/debian/changelog --- cupsys-1.2.2/debian/changelog +++ cupsys-1.2.2/debian/changelog @@ -1,3 +1,10 @@ +cupsys (1.2.2-0ubuntu0.6.06.1~proposed1) dapper-proposed; urgency=low + + * debian/patches/99-svn5875.dpatch: reverts some changes from CUPS STR + 1795, thanks to Ante Karamatic (LP: #55282). + + -- Kees Cook Sat, 10 Feb 2007 20:44:32 -0800 + cupsys (1.2.2-0ubuntu0.6.06) dapper-updates; urgency=low * New upstream bugfix release: diff -u cupsys-1.2.2/debian/patches/00list cupsys-1.2.2/debian/patches/00list --- cupsys-1.2.2/debian/patches/00list +++ cupsys-1.2.2/debian/patches/00list @@ -22,2 +22,3 @@ 58_cupsd.conf-AllowLocal.dpatch +99-svn5875.dpatch ubuntu-nowebadmin.dpatch only in patch2: unchanged: --- cupsys-1.2.2.orig/debian/patches/99-svn5875.dpatch +++ cupsys-1.2.2/debian/patches/99-svn5875.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99-svn5875.dpatch by Ante Karamatic +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad cupsys-1.2.2~/scheduler/job.c cupsys-1.2.2/scheduler/job.c +--- cupsys-1.2.2~/scheduler/job.c 2006-08-24 21:34:31.000000000 +0200 ++++ cupsys-1.2.2/scheduler/job.c 2006-08-24 21:37:34.000000000 +0200 +@@ -3022,7 +3022,7 @@ + { + snprintf(final_content_type, sizeof(final_content_type), + "FINAL_CONTENT_TYPE=%s/%s", +- filter->src->super, filter->src->type); ++ filter->dst->super, filter->dst->type); + envp[envc ++] = final_content_type; + } +