[Pkg-cups-devel] r319 - in cupsys/branches/cups-1.2/debian: .

[Martin Pitt]

Author: mpitt
Date: Mon Jul 24 07:59:34 2006
New Revision: 319

Added:
   cupsys/branches/cups-1.2/debian/patches/54_cups-config_modeldir.dpatch
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
* debian/patches/54_cups-config_modeldir.dpatch: Add --modeldir to
  cups-config so that other packages can use it to figure out the correct
  PPD base path.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Mon Jul 24 07:59:34 2006
@@ -20,9 +20,11 @@
     SSL certificate, in order to not break permissions of customized global
     ones (like the one from the ssl-cert package). Grrr, cups, no, you cannot
     own the world!
+  * debian/patches/54_cups-config_modeldir.dpatch: Add --modeldir to
+    cups-config so that other packages can use it to figure out the correct
+    PPD base path.
 
-
- -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Jul 2006 09:55:26 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Jul 2006 09:59:39 +0200
 
 cupsys (1.2.1-4) unstable; urgency=medium
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Mon Jul 24 07:59:34 2006
@@ -18,6 +18,7 @@
 47_pid.dpatch
 #48_stdlib.dpatch
 53_usr_share_ppd_support.dpatch
+54_cups-config_modeldir.dpatch
 55_ppd_okidata_name.dpatch
 56_dirsvc.dpatch
 #57_cupsaddsmb.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/54_cups-config_modeldir.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/54_cups-config_modeldir.dpatch	Mon Jul 24 07:59:34 2006
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 54_cups-config_modeldir.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4929~/cups-config.in cupsys-1.1.99.b1.r4929/cups-config.in
+--- cupsys-1.1.99.b1.r4929~/cups-config.in	2005-10-19 15:48:06.000000000 +0200
++++ cupsys-1.1.99.b1.r4929/cups-config.in	2006-04-07 16:04:46.000000000 +0200
+@@ -61,6 +61,7 @@
+     echo "       cups-config [--image] [--static] --libs"
+     echo "       cups-config --serverbin"
+     echo "       cups-config --serverroot"
++    echo "       cups-config --modeldir"
+     echo "       cups-config --version"
+ 
+     exit $1
+@@ -118,6 +119,8 @@
+ 	--static)
+ 	    static=yes
+ 	    ;;
++        --modeldir
++	    echo /usr/share/ppd
+ 	--version)
+ 	    echo $VERSION
+ 	    ;;