foomatic-filters 4.0.7-0ubuntu1ubuntu/4.0.7-0ubuntu1

12 files changed, 78 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 4180489..0e3daac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
+2011-02-18  Till Kamppeter <till.kamppeter@gmail.com>
+
+	* Tagged branch for release 4.0.7.
+
+	* VERSION, README, USAGE, configure.ac: Updated for release 4.0.7.
+
+2011-01-04  Till Kamppeter <till.kamppeter@gmail.com>
+
+        * acinclude.m4, configure.ac: General cleanup (as in bugs #609,
+          #610).
+
+2010-12-23  Till Kamppeter <till.kamppeter@gmail.com>
+
+	* README: Corrected several typos. Thanks to Christopher Yeleighton
+	  (giecrilj at stegny dot 2a dot pl) for the patch (bug #598).
+
+2010-12-16  Till Kamppeter <till.kamppeter@gmail.com>
+
+	* README: Corrected e-mail address of Helge Bliscke.
+
 2010-12-15  Till Kamppeter <till.kamppeter@gmail.com>
 
+	* foomaticrip.c: Run strtok() on a copy of the list of input files
+	  for the first check, as strtok() modifies the string it parses,
+	  overwriting the delimiters with zeros. Before, the list of input
+	  files only showed its first entry when being parsed again for
+	  actually printing the files (Ubuntu bug #676680).
+
 	* Tagged branch for release 4.0.6.
 
 	* VERSION, README, USAGE, configure.ac: Updated for release 4.0.6.
@@ -866,7 +892,7 @@
 	  page accounting PostScript code in foomatic-rip overriding
 	  already exisiting /EndPage procedures. Added output of error
 	  code when foomatic-rip dies. Thanks to Helge Blischke
-	  (h dot blischke at srz dot de) for all these fixes and
+	  (h dot blischke at acm dot org) for all these fixes and
 	  enhancements.
 
 2004-09-14  Till Kamppeter <till.kamppeter@gmx.net>
diff --git a/README b/README
index cd2a514..f28ecda 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-Foomatic 4.0.6
+Foomatic 4.0.7
 ==============
 
 
@@ -30,7 +30,7 @@ Authors
 Till Kamppeter <till.kamppeter@gmail.com>
 Lars Uebernickel <larsuebernickel@gmx.de>
 Grant Taylor <gtaylor@picante.com>
-Helge Blischke <h.blischke@srz.de>
+Helge Blischke <h.blischke@acm.org>
 
 
 Bugs
@@ -79,7 +79,7 @@ CPS      - Coherent Printing System (http://www.tww.cx/cps.php, development
 ---      - Direct, spooler-less printing (http://www.openprinting.org/)
 
 As most of the supported printing systems are not actively developed
-any more, there support will be removed in a later version of
+any more, support for them will be removed in a later version of
 foomatic-rip. This can even happen before 5.x. For now their support
 is deprecated and there were only few tests done during the
 development of foomatic-rip 4.x. So be prepared that there are bugs
@@ -182,7 +182,7 @@ parsed the PPD file we have a renderer command line and a list of
 options with the range of possible settings and a default setting. For
 LPRng, LPD, GNUlpr, and spooler-less printing we get also the
 so-called postpipe here, defining a shell command line into which
-foomatic-rip should firect its output. If no postpipe is found, the
+foomatic-rip should direct its output. If no postpipe is found, the
 output data goes to standard output. The postpipe allows to print to
 destinations which are not directly supported by the spooler.
 
@@ -210,8 +210,8 @@ listing would be the job which the user has sent.
 
 Print files
 
-With some spoolers the job(s) to be printed is supplied in (a)
-file(s), in this case we close standard input and open the file on the
+With some spoolers the jobs to be printed are supplied in files.
+In this case we close standard input and open the file on the
 standard input handler. This way the following steps read from the
 file instead of from standard input. The rest of the foomatic-rip
 process is repeated for every input file, to print them one after the
diff --git a/USAGE b/USAGE
index b760f3f..e48a7d7 100644
--- a/USAGE
+++ b/USAGE
@@ -1,5 +1,5 @@
 
-Foomatic 4.0.6
+Foomatic 4.0.7
 ==============
 
 foomatic-filters
diff --git a/VERSION b/VERSION
index d13e837..43beb40 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.6
+4.0.7
diff --git a/VERSION.full b/VERSION.full
index e0049e4..bdfc3ce 100644
--- a/VERSION.full
+++ b/VERSION.full
@@ -1 +1 @@
-4.0.6.230
+4.0.7.235
diff --git a/acinclude.m4 b/acinclude.m4
index 1c36cea..05ce917 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,5 @@
-dnl AC_PATH_DIR(VARIABLE, DIR-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AC_PATH_DIR],
+dnl FM_PATH_DIR(VARIABLE, DIR-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([FM_PATH_DIR],
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word/])
@@ -40,12 +40,12 @@ fi
 AC_SUBST($1)dnl
 ])
 
-dnl AC_PATH_DIRS(VARIABLE, DIRSS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
+dnl FM_PATH_DIRS(VARIABLE, DIRSS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
 dnl              [, PATH]])
-AC_DEFUN([AC_PATH_DIRS],
+AC_DEFUN([FM_PATH_DIRS],
 [for ac_dir in $2
 do
-AC_PATH_DIR($1, [$]ac_dir, , $4)
+FM_PATH_DIR($1, [$]ac_dir, , $4)
 test -n "[$]$1" && break
 done
 ifelse([$3], , , [test -n "[$]$1" || $1="$3"
diff --git a/configure b/configure
index d4fe980..1076384 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.61 for foomatic-rip "4.0.6".
+# Generated by GNU Autoconf 2.61 for foomatic-rip 4.0.7.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='foomatic-rip'
 PACKAGE_TARNAME='foomatic-rip'
-PACKAGE_VERSION='"4.0.6"'
-PACKAGE_STRING='foomatic-rip "4.0.6"'
+PACKAGE_VERSION='4.0.7'
+PACKAGE_STRING='foomatic-rip 4.0.7'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="options.c"
@@ -1232,7 +1232,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.6" to adapt to many kinds of systems.
+\`configure' configures foomatic-rip 4.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1298,7 +1298,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of foomatic-rip "4.0.6":";;
+     short | recursive ) echo "Configuration of foomatic-rip 4.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1394,7 +1394,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-foomatic-rip configure "4.0.6"
+foomatic-rip configure 4.0.7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1408,7 +1408,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.6", which was
+It was created by foomatic-rip $as_me 4.0.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2098,7 +2098,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='foomatic-rip'
- VERSION='"4.0.6"'
+ VERSION='4.0.7'
 
 
 # Some tools Automake needs.
@@ -6835,6 +6835,7 @@ if test x$uname = xIRIX; then
   LIBSEARCHPATH="/usr/freeware/lib32:/usr/freeware/lib:$LIBSEARCHPATH"
 fi
 
+# Check for Perl
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -6922,6 +6923,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
+# Check for cups-config
 # Extract the first word of "cups-config", so it can be a program name with args.
 set dummy cups-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -6963,6 +6965,7 @@ fi
 
 
 
+# Use cups-config to find CUPS directories
 if test -n "$CUPS_CONFIG" && test -z "$CUPS_SERVERBIN"; then
 	CUPS_SERVERBIN=`cups-config --serverbin 2>/dev/null`
 fi
@@ -7850,7 +7853,7 @@ exec 6>&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.6", which was
+This file was extended by foomatic-rip $as_me 4.0.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7903,7 +7906,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-foomatic-rip config.status "4.0.6"
+foomatic-rip config.status 4.0.7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 7e5ab5e..c0fcc46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.61)
-AC_INIT(foomatic-rip, "4.0.6")
+AC_PREREQ([2.61])
+AC_INIT(foomatic-rip, [4.0.7])
 AM_INIT_AUTOMAKE([no-define])
 AC_CONFIG_SRCDIR([options.c])
 
@@ -56,7 +56,7 @@ if test x$uname = xIRIX; then
   LIBSEARCHPATH="/usr/freeware/lib32:/usr/freeware/lib:$LIBSEARCHPATH"
 fi
 
-dnl Check for Perl
+# Check for Perl
 AC_PATH_PROG(PERL,perl)
 
 if test -z "$PERL"; then
@@ -64,12 +64,12 @@ if test -z "$PERL"; then
 fi
 
 # Check for /etc/printcap
-AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
+FM_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
 
-dnl Check for cups-config
+# Check for cups-config
 AC_PATH_PROG(CUPS_CONFIG,cups-config)
 
-dnl Use cups-config to find CUPS directories
+# Use cups-config to find CUPS directories
 if test -n "$CUPS_CONFIG" && test -z "$CUPS_SERVERBIN"; then
 	CUPS_SERVERBIN=`cups-config --serverbin 2>/dev/null`
 fi
@@ -82,23 +82,23 @@ if test -n "$CUPS_SERVERBIN"; then
 	AC_SUBST(CUPS_BACKENDS)
 else
 	# Check for /usr/lib/cups
-	AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
+	FM_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
 
 	# Check for /usr/lib/cups/filter
-	AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
+	FM_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
 
 	# Check for /usr/lib/cups/backend
-	AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
+	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
 fi
 
 # Check for /usr/lib/ppr
-AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
+FM_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
 
 # Check for /usr/lib/ppr/interfaces
-AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
+FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
 
 # Check for /usr/lib/ppr/lib
-AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
+FM_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
 
 AC_ARG_ENABLE(file-converter-check, [  --enable-file-converter-check  check whether a file converter is installed [default=yes]],
 [if eval "test x${enableval} = xno"; then
diff --git a/debian/changelog b/debian/changelog
index 303b83b..d89e77d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+foomatic-filters (4.0.7-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+     - foomatic-rip printed only the first file supplied on the command line
+       when multiple files are supplied (spooler-less printing mode,
+       LP: #676680).
+  * debian/patches/foomatic-rip-read-multiple-input-files.patch: Removed
+    patches with fix backported from upstream.
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Fri, 18 Feb 2010 16:24:03 +0100
+
 foomatic-filters (4.0.6-1) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/foomatic-rip-read-multiple-input-files.patch b/debian/patches/foomatic-rip-read-multiple-input-files.patch
deleted file mode 100644
index 30dc65c..0000000
--- a/debian/patches/foomatic-rip-read-multiple-input-files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/foomaticrip.c
-+++ b/foomaticrip.c
-@@ -1383,7 +1383,7 @@
-         dstrcpyf(filelist, "<STDIN>");
- 
-     /* Check filelist */
--    p = strtok(filelist->data, " ");
-+    p = strtok(strdup(filelist->data), " ");
-     while (p) {
-         if (strcmp(p, "<STDIN>") != 0) {
-             if (p[0] == '-')
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 40c8e30..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-foomatic-rip-read-multiple-input-files.patch
diff --git a/foomaticrip.c b/foomaticrip.c
index 089e4ff..41a7577 100644
--- a/foomaticrip.c
+++ b/foomaticrip.c
@@ -1383,7 +1383,7 @@ int main(int argc, char** argv)
         dstrcpyf(filelist, "<STDIN>");
 
     /* Check filelist */
-    p = strtok(filelist->data, " ");
+    p = strtok(strdup(filelist->data), " ");
     while (p) {
         if (strcmp(p, "<STDIN>") != 0) {
             if (p[0] == '-')