[Pkg-cups-devel] r540 - in cupsys/trunk/debian: . local/filters

[Martin Pitt]

Author: mpitt
Date: Fri Aug 10 16:05:08 2007
New Revision: 540

Log:
* debian/local/filters/pdftops: Do not pass /etc/cups/pdftops.conf to
  pdftops if it does not exist (poppler-utils does not have this file).
  (https://launchpad.net/bugs/125300)

Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/local/filters/pdftops

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Fri Aug 10 16:05:08 2007
@@ -6,8 +6,11 @@
     debian/cupsys.install.
   * Merge debian/cupsys.files into debian/cupsys.install and remove the
     former. Two different files are just too confusing.
+  * debian/local/filters/pdftops: Do not pass /etc/cups/pdftops.conf to
+    pdftops if it does not exist (poppler-utils does not have this file).
+    (https://launchpad.net/bugs/125300)
 
- -- Martin Pitt <mpitt at debian.org>  Fri, 10 Aug 2007 09:55:26 +0200
+ -- Martin Pitt <mpitt at debian.org>  Fri, 10 Aug 2007 18:03:55 +0200
 
 cupsys (1.2.12-3) unstable; urgency=low
 

Modified: cupsys/trunk/debian/local/filters/pdftops
==============================================================================
--- cupsys/trunk/debian/local/filters/pdftops	(original)
+++ cupsys/trunk/debian/local/filters/pdftops	Fri Aug 10 16:05:08 2007
@@ -104,7 +104,12 @@
 # Check the options string for options to modify the bahaviour of the pdftops utility:
 #
 @optarr = split (/\s+/, $options);
-$cmdopt = "-cfg " . $ENV{CUPS_SERVERROOT} . "/pdftops.conf";	# This cannot be changed
+$cfgfile = $ENV{CUPS_SERVERROOT} . "/pdftops.conf";
+if (-e $cfgfile) {
+    $cmdopt = "-cfg " . $ENV{CUPS_SERVERROOT} . "/pdftops.conf";	# This cannot be changed
+} else {
+    $cmdopt = "";
+}
 # The following are the (parameterless) command line options that may be used to change the 
 # defaults defiend by pdftops.conf
 $simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';