[Pkg-cups-devel] r177 - cupsys/branches/cups-1.2-ubuntu/debian/patches

[Martin Pitt]

Author: mpitt
Date: Thu Apr 13 09:05:47 2006
New Revision: 177

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/54_cups-config_modeldir.dpatch
Log:
add patches for future native support of /usr/share/ppd; disabled for now

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/53_usr_share_ppd_support.dpatch	Thu Apr 13 09:05:47 2006
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 53_usr_share_ppd_support.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~/scheduler/cups-driverd.c cupsys-1.1.99.b1.r4929/scheduler/cups-driverd.c
+--- cupsys-1.1.99.b1.r4929~/scheduler/cups-driverd.c	2005-10-25 20:23:10.000000000 +0200
++++ cupsys-1.1.99.b1.r4929/scheduler/cups-driverd.c	2006-04-07 15:43:44.000000000 +0200
+@@ -289,10 +289,7 @@
+     * Try opening the file...
+     */
+ 
+-    if ((datadir = getenv("CUPS_DATADIR")) == NULL)
+-      datadir = CUPS_DATADIR;
+-
+-    snprintf(line, sizeof(line), "%s/model/%s", datadir, name);
++    snprintf(line, sizeof(line), "/usr/share/ppd/%s", datadir, name);
+     if ((fp = cupsFileOpen(line, "r")) == NULL)
+     {
+       fprintf(stderr, "ERROR: [cups-driverd] Unable to open \"%s\" - %s\n",
+@@ -443,11 +440,7 @@
+ 
+   SortedPPDs = NumPPDs;
+ 
+-  if ((cups_datadir = getenv("CUPS_DATADIR")) == NULL)
+-    cups_datadir = CUPS_DATADIR;
+-
+-  snprintf(model, sizeof(model), "%s/model", cups_datadir);
+-  load_ppds(model, "");
++  load_ppds("/usr/share/ppd", "");
+ 
+  /*
+   * Cull PPD files that are no longer present...

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/54_cups-config_modeldir.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/54_cups-config_modeldir.dpatch	Thu Apr 13 09:05:47 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
+ 	    ;;