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

[Kenshi Muto]

Author: kmuto
Date: Thu Feb  1 12:00:41 2007
New Revision: 427

Added:
   cupsys/branches/cups-1.2/debian/patches/00_09str2198.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
Log:
apply STR2198

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Thu Feb  1 12:00:41 2007
@@ -6,6 +6,9 @@
     critical bug.
   * Provides /usr/local/share/ppd and /opt/share/ppd
     to satisfy LSB 3.2. (closes: #408154)
+  * Applied upstream patch:
+    - STR2198: The scheduler still loaded the remote printer cache,
+      even when browsing was disabled
   * Debconf translation
     - Portuguese (closes: #408332)
     - Norwegian (closes: #406253)

Added: cupsys/branches/cups-1.2/debian/patches/00_09str2198.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/00_09str2198.dpatch	Thu Feb  1 12:00:41 2007
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_09str2198.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.7~/scheduler/dirsvc.c cupsys-1.2.7/scheduler/dirsvc.c
+--- cupsys-1.2.7~/scheduler/dirsvc.c	2007-02-01 10:56:49.000000000 +0000
++++ cupsys-1.2.7/scheduler/dirsvc.c	2007-02-01 10:57:46.000000000 +0000
+@@ -163,7 +163,7 @@
+   * Don't load the cache if the CUPS remote protocol is disabled...
+   */
+ 
+-  if (!(BrowseRemoteProtocols & BROWSE_CUPS))
++  if (!Browsing || !(BrowseRemoteProtocols & BROWSE_CUPS))
+   {
+     cupsdLogMessage(CUPSD_LOG_DEBUG,
+                     "cupsdLoadRemoteCache: Not loading remote cache.");

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	Thu Feb  1 12:00:41 2007
@@ -7,6 +7,7 @@
 00_06str2121.dpatch
 00_07str2123.dpatch
 00_08str2135.dpatch
+00_09str2198.dpatch
 02_configure.dpatch
 #03_manext.dpatch
 03_clean.dpatch