diff -Nru foomatic-filters-4.0.15/ChangeLog foomatic-filters-4.0.16/ChangeLog --- foomatic-filters-4.0.15/ChangeLog 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/ChangeLog 2012-06-18 21:06:55.000000000 +0200 @@ -1,3 +1,20 @@ +2012-06-18 Till Kamppeter + + * Tagged branch for release 4.0.16. + + * VERSION, README, USAGE, configure.ac: Updated for release 4.0.16. + + * foomaticrip.c: Fixed wrong access to command line option list which + prevented the command line options being passed on to the pdftops + CUPS filter when incoming PDF is converted to PostScript (Ubuntu + bug #1002699). + +2012-06-06 Till Kamppeter + + * spooler.c: Fixed off-by-one bug which has cut off the last character + of the option string for CUPS (5th command line argument) and so made + the last option setting not being applied (Ubuntu bug #1003194). + 2012-03-23 Till Kamppeter * Tagged branch for release 4.0.15. diff -Nru foomatic-filters-4.0.15/configure foomatic-filters-4.0.16/configure --- foomatic-filters-4.0.15/configure 2012-03-23 13:28:36.000000000 +0100 +++ foomatic-filters-4.0.16/configure 2012-06-18 21:06:57.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.15. +# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.16. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ # Identity of this package. PACKAGE_NAME='foomatic-rip' PACKAGE_TARNAME='foomatic-rip' -PACKAGE_VERSION='4.0.15' -PACKAGE_STRING='foomatic-rip 4.0.15' +PACKAGE_VERSION='4.0.16' +PACKAGE_STRING='foomatic-rip 4.0.16' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1270,7 +1270,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures foomatic-rip 4.0.15 to adapt to many kinds of systems. +\`configure' configures foomatic-rip 4.0.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of foomatic-rip 4.0.15:";; + short | recursive ) echo "Configuration of foomatic-rip 4.0.16:";; esac cat <<\_ACEOF @@ -1440,7 +1440,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -foomatic-rip configure 4.0.15 +foomatic-rip configure 4.0.16 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1897,7 +1897,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by foomatic-rip $as_me 4.0.15, which was +It was created by foomatic-rip $as_me 4.0.16, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2705,7 +2705,7 @@ # Define the identity of the package. PACKAGE='foomatic-rip' - VERSION='4.0.15' + VERSION='4.0.16' # Some tools Automake needs. @@ -6871,7 +6871,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by foomatic-rip $as_me 4.0.15, which was +This file was extended by foomatic-rip $as_me 4.0.16, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6937,7 +6937,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -foomatic-rip config.status 4.0.15 +foomatic-rip config.status 4.0.16 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru foomatic-filters-4.0.15/configure.ac foomatic-filters-4.0.16/configure.ac --- foomatic-filters-4.0.15/configure.ac 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/configure.ac 2012-06-18 21:06:55.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT(foomatic-rip, [4.0.15]) +AC_INIT(foomatic-rip, [4.0.16]) AM_INIT_AUTOMAKE([no-define]) AC_CONFIG_SRCDIR([options.c]) diff -Nru foomatic-filters-4.0.15/debian/changelog foomatic-filters-4.0.16/debian/changelog --- foomatic-filters-4.0.15/debian/changelog 2012-03-23 13:50:45.000000000 +0100 +++ foomatic-filters-4.0.16/debian/changelog 2012-06-18 23:23:53.000000000 +0200 @@ -1,13 +1,27 @@ -foomatic-filters (4.0.15-0ubuntu1) precise; urgency=low +foomatic-filters (4.0.16-0ubuntu0.1) precise-proposed; urgency=low * New upstream release + - Fixes LP: #1002699. + - Fixed off-by-one bug which has cut off the last character of the + option string for CUPS (5th command line argument) and so made the + last option setting not being applied. + - Fixed wrong access to command line option list which prevented the + command line options being passed on to the pdftops CUPS filter + when incoming PDF is converted to PostScript. + + -- Till Kamppeter Mon, 18 Jun 2012 21:37:03 +0200 + +foomatic-filters (4.0.15-1) unstable; urgency=low + + [ Till Kamppeter ] + * New upstream release - Improved check whether a driver works with PDF input data: Do not take into account bogus options which appear due to bugs in PPD files (type is TYPE_NONE) or composite options and in addition add debug output to show the reason for the decision to convert to PostScript (LP: #953962). - -- Till Kamppeter Fri, 23 Mar 2012 13:41:03 +0100 + -- Didier Raboud Mon, 26 Mar 2012 11:32:54 +0200 foomatic-filters (4.0.14-1) unstable; urgency=low diff -Nru foomatic-filters-4.0.15/foomaticrip.c foomatic-filters-4.0.16/foomaticrip.c --- foomatic-filters-4.0.15/foomaticrip.c 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/foomaticrip.c 2012-06-18 21:06:55.000000000 +0200 @@ -1062,7 +1062,7 @@ if (spooler == SPOOLER_CUPS) snprintf(pdf2ps_cmd, PATH_MAX, "pdftops '%s' '%s' '%s' '%s' '%s' '%s'", - job->id, job->user, job->title, "1", job->optstr, + job->id, job->user, job->title, "1", job->optstr->data, filename); else snprintf(pdf2ps_cmd, PATH_MAX, diff -Nru foomatic-filters-4.0.15/README foomatic-filters-4.0.16/README --- foomatic-filters-4.0.15/README 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/README 2012-06-18 21:06:55.000000000 +0200 @@ -1,5 +1,5 @@ -Foomatic 4.0.15 +Foomatic 4.0.16 =============== diff -Nru foomatic-filters-4.0.15/spooler.c foomatic-filters-4.0.16/spooler.c --- foomatic-filters-4.0.15/spooler.c 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/spooler.c 2012-06-18 21:06:55.000000000 +0200 @@ -274,7 +274,7 @@ cups_options_len = strlen(arglist_get(arglist, 4)); cups_options = malloc(cups_options_len + 1); - strncpy_omit(cups_options, arglist_get(arglist, 4), cups_options_len, omit_shellescapes); + strncpy_omit(cups_options, arglist_get(arglist, 4), cups_options_len + 1, omit_shellescapes); /* Common job parameters */ strcpy(job->id, cups_jobid); diff -Nru foomatic-filters-4.0.15/USAGE foomatic-filters-4.0.16/USAGE --- foomatic-filters-4.0.15/USAGE 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/USAGE 2012-06-18 21:06:55.000000000 +0200 @@ -1,5 +1,5 @@ -Foomatic 4.0.15 +Foomatic 4.0.16 =============== foomatic-filters diff -Nru foomatic-filters-4.0.15/VERSION foomatic-filters-4.0.16/VERSION --- foomatic-filters-4.0.15/VERSION 2012-03-23 13:28:34.000000000 +0100 +++ foomatic-filters-4.0.16/VERSION 2012-06-18 21:06:55.000000000 +0200 @@ -1 +1 @@ -4.0.15 +4.0.16 diff -Nru foomatic-filters-4.0.15/VERSION.full foomatic-filters-4.0.16/VERSION.full --- foomatic-filters-4.0.15/VERSION.full 2012-03-23 13:28:38.000000000 +0100 +++ foomatic-filters-4.0.16/VERSION.full 2012-06-18 21:06:58.000000000 +0200 @@ -1 +1 @@ -4.0.15.251 +4.0.16.253