From c618c723c3fec49ed2a34631727ea40c5334dcf1 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Fri, 23 Mar 2012 13:37:25 +0100 Subject: Imported Upstream version 4.0.15 --- ChangeLog | 12 ++++++++++++ README | 2 +- USAGE | 2 +- VERSION | 2 +- VERSION.full | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- options.c | 13 +++++++++---- 8 files changed, 36 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 016afdc..38c707f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-03-23 Till Kamppeter + + * Tagged branch for release 4.0.15. + + * VERSION, README, USAGE, configure.ac: Updated for release 4.0.15. + + * options.c: 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 (Ubuntu bugs #953962 and #960989). + 2012-03-14 Till Kamppeter * Tagged branch for release 4.0.14. diff --git a/README b/README index 5e16aa0..e357d46 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Foomatic 4.0.14 +Foomatic 4.0.15 =============== diff --git a/USAGE b/USAGE index 3d5fcab..668d966 100644 --- a/USAGE +++ b/USAGE @@ -1,5 +1,5 @@ -Foomatic 4.0.14 +Foomatic 4.0.15 =============== foomatic-filters diff --git a/VERSION b/VERSION index 80c4caf..af253c1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.14 +4.0.15 diff --git a/VERSION.full b/VERSION.full index 6b6029a..df3f72b 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.14.249 +4.0.15.251 diff --git a/configure b/configure index ed00e18..6d2363d 100755 --- a/configure +++ b/configure @@ -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.14. +# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.15. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='foomatic-rip' PACKAGE_TARNAME='foomatic-rip' -PACKAGE_VERSION='4.0.14' -PACKAGE_STRING='foomatic-rip 4.0.14' +PACKAGE_VERSION='4.0.15' +PACKAGE_STRING='foomatic-rip 4.0.15' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then # 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.14 to adapt to many kinds of systems. +\`configure' configures foomatic-rip 4.0.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of foomatic-rip 4.0.14:";; + short | recursive ) echo "Configuration of foomatic-rip 4.0.15:";; esac cat <<\_ACEOF @@ -1440,7 +1440,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -foomatic-rip configure 4.0.14 +foomatic-rip configure 4.0.15 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF 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.14, which was +It was created by foomatic-rip $as_me 4.0.15, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2705,7 +2705,7 @@ fi # Define the identity of the package. PACKAGE='foomatic-rip' - VERSION='4.0.14' + VERSION='4.0.15' # Some tools Automake needs. @@ -6871,7 +6871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.14, which was +This file was extended by foomatic-rip $as_me 4.0.15, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6937,7 +6937,7 @@ _ACEOF 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.14 +foomatic-rip config.status 4.0.15 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6a322cc..22cbdc9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT(foomatic-rip, [4.0.14]) +AC_INIT(foomatic-rip, [4.0.15]) AM_INIT_AUTOMAKE([no-define]) AC_CONFIG_SRCDIR([options.c]) diff --git a/options.c b/options.c index 662cedd..d14c287 100644 --- a/options.c +++ b/options.c @@ -1901,12 +1901,16 @@ int ppd_supports_pdf() { choice_t *choice; - if (!option_is_ps_command(opt)) - continue; + if (!option_is_ps_command(opt) || option_is_composite(opt) || + (opt->type == TYPE_NONE)) + continue; for (choice = opt->choicelist; choice; choice = choice->next) - if (contains_active_postscript(choice->command)) - return 0; + if (contains_active_postscript(choice->command)) { + _log(" PostScript option found: %s=%s: \"%s\"\n", + opt->name, choice->value, choice->command); + return 0; + } } if (!isempty(cmd_pdf)) @@ -1920,6 +1924,7 @@ int ppd_supports_pdf() return 1; } + _log(" Neither PDF renderer command line nor Ghostscript-based renderer command line found\n"); return 0; } -- cgit v1.2.3