[Pkg-cups-devel] r818 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Fri Aug 15 06:17:48 2008
New Revision: 818

Log:
Add cupsfilter-path-typo.dpatch: Fix a typo in scheduler/cupsfilter.c,
which caused filters not to have /bin in their PATH.

Added:
   cupsys/trunk/debian/patches/cupsfilter-path-typo.dpatch
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Fri Aug 15 06:17:48 2008
@@ -20,6 +20,10 @@
     Added "Depends: ttf-freefont" for the cups package, as the
     texttopdf filter needs these fonts.
 
+  [ Johan Kiviniemi ]
+  * Add cupsfilter-path-typo.dpatch: Fix a typo in scheduler/cupsfilter.c,
+    which caused filters not to have /bin in their PATH.
+
  -- Martin Pitt <mpitt at debian.org>  Thu, 14 Aug 2008 17:40:59 +0200
 
 cups (1.3.8-3) experimental; urgency=low

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Fri Aug 15 06:17:48 2008
@@ -24,6 +24,7 @@
 reactivate_recommended_driver.dpatch
 include_krb5_h_in_job_h.dpatch
 search_mime_files_in_usr_share.dpatch
+cupsfilter-path-typo.dpatch
 
 # Ubuntu patches
 ubuntu-disable-browsing.dpatch

Added: cupsys/trunk/debian/patches/cupsfilter-path-typo.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/cupsfilter-path-typo.dpatch	Fri Aug 15 06:17:48 2008
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cupsfilter-path-typo.dpatch by Johan Kiviniemi <debian at johan.kiviniemi.name>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a typo in cupsfilter, causing filters not to have /bin in their
+## DP: PATH.
+
+ at DPATCH@
+diff -urNad cups-1.3.8~/scheduler/cupsfilter.c cups-1.3.8/scheduler/cupsfilter.c
+--- cups-1.3.8~/scheduler/cupsfilter.c	2008-08-13 12:14:17.803302953 +0300
++++ cups-1.3.8/scheduler/cupsfilter.c	2008-08-13 12:14:36.815297551 +0300
+@@ -928,7 +928,7 @@
+   }
+ 
+   snprintf(line, sizeof(line),
+-           "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ":/bin/usr/bin",
++           "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ":/bin:/usr/bin",
+ 	   ServerBin);
+   set_string(&Path, line);
+