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

[Kenshi Muto]

Author: kmuto
Date: Wed Jul 19 04:44:42 2006
New Revision: 301

Added:
   cupsys/branches/cups-1.2/debian/patches/60_device_uri.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
add 60_device_uri: preserve old URI at Web interface

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Jul 19 04:44:42 2006
@@ -27,6 +27,8 @@
     that lp module is loaded by discover or any other hardware detection
     programs instead of CUPS. We provide a module loader by init script
     for user's convenience at this time.
+  * 60_device_uri: preserve old URI during the printer configuration on
+    Web interface.
 
  -- Kenshi Muto <kmuto at debian.org>  Wed, 21 Jun 2006 15:06:02 +0000
 

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	Wed Jul 19 04:44:42 2006
@@ -23,3 +23,4 @@
 #57_cupsaddsmb.dpatch
 58_fixdestc.dpatch
 59_de_docroot.dpatch
+60_device_uri.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/60_device_uri.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/60_device_uri.dpatch	Wed Jul 19 04:44:42 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_device_uri.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.1~/cgi-bin/admin.c cupsys-1.2.1/cgi-bin/admin.c
+--- cupsys-1.2.1~/cgi-bin/admin.c	2006-07-19 04:25:44.000000000 +0000
++++ cupsys-1.2.1/cgi-bin/admin.c	2006-07-19 04:27:50.000000000 +0000
+@@ -691,7 +691,7 @@
+       * Set the current device URI for the form to the old one...
+       */
+ 
+-      if (strncmp(attr->values[0].string.text, var, strlen(var)) == 0)
++      /* if (strncmp(attr->values[0].string.text, var, strlen(var)) == 0) */
+ 	cgiSetVariable("DEVICE_URI", attr->values[0].string.text);
+     }
+