diff -u cups-1.3.9/debian/changelog cups-1.3.9/debian/changelog --- cups-1.3.9/debian/changelog +++ cups-1.3.9/debian/changelog @@ -1,3 +1,15 @@ +cups (1.3.9-2ubuntu8) intrepid-proposed; urgency=low + + * debian/patches/pdftops-cups-1.4.dpatch: Let the pdftops filter only emit + PostScript level 2 and not level 3, as some PostScript printers have + problems with PostScript level 3 from Poppler, even if they are level 3 + printers (LP: #277404). + + * debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx: Do not preceed the + PDF output with a newline (LP: #303691). + + -- Till Kamppeter Tue, 27 Jan 2009 16:36:55 +0100 + cups (1.3.9-2ubuntu7) intrepid-proposed; urgency=low * debian/local/filters/pdf-filters/pdftopdf/P2PPage.cxx, @@ -7,7 +19,7 @@ line if no manipulations affecting the printout size are done (N-up, scaling, fitplot, ...). This caused LP: #310575. - -- Till Kamppeter Mon, 10 Jan 2008 13:19:55 +0100 + -- Till Kamppeter Mon, 10 Jan 2009 13:19:55 +0100 cups (1.3.9-2ubuntu6.1) intrepid-security; urgency=low diff -u cups-1.3.9/debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx cups-1.3.9/debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx --- cups-1.3.9/debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx +++ cups-1.3.9/debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx @@ -103,6 +103,7 @@ char buf[1024]; ppd_attr_t *attr; int pdftoopvp = 0; + int datawritten = 0; if (ppd == 0) return; if ((attr = ppdFindAttr(ppd,"pdftopdfJCLBegin",NULL)) != NULL) { @@ -114,6 +115,7 @@ continue; } fputc(attr->value[i],fp); + datawritten = 1; } } @@ -123,8 +125,10 @@ } else { if ((attr = ppdFindAttr(ppd,"pdftopdfJCLCopies",buf)) != NULL) { fputs(attr->value,fp); + datawritten = 1; } else if (pdftoopvp) { fprintf(fp,"Copies=%d;",copies); + datawritten = 1; } } for (section = (int)PPD_ORDER_ANY; @@ -137,14 +141,16 @@ ((ppd_option_t *)(choices[i]->option))->keyword); if ((attr = ppdFindAttr(ppd,buf,choices[i]->choice)) != NULL) { fputs(attr->value,fp); + datawritten = 1; } else if (pdftoopvp) { fprintf(fp,"%s=%s;", ((ppd_option_t *)(choices[i]->option))->keyword, choices[i]->choice); + datawritten = 1; } } } - fputc('\n',fp); + if (datawritten) fputc('\n',fp); } void parseOpts(int argc, char **argv) diff -u cups-1.3.9/debian/patches/pdftops-cups-1.4.dpatch cups-1.3.9/debian/patches/pdftops-cups-1.4.dpatch --- cups-1.3.9/debian/patches/pdftops-cups-1.4.dpatch +++ cups-1.3.9/debian/patches/pdftops-cups-1.4.dpatch @@ -224,7 +224,7 @@ + pdfargv[pdfargc++] = (char *)"-noembtt"; + } + else -+ pdfargv[pdfargc++] = (char *)"-level3"; ++ pdfargv[pdfargc++] = (char *)"-level2"; + + /* + * Set output page size...