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

[Martin Pitt]

Author: mpitt
Date: Mon Jul 24 07:48:16 2006
New Revision: 315

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

Log:
* Revive debian/patches/56_dirsvc.dpatch; it's still not fixed upstream.

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:48:16 2006
@@ -10,8 +10,9 @@
   * debian/cupsys.init.d: If lp module loading is requested, also load the
     'ppdev' module to fix the name and model detection of parallel printers on
     newer kernels.
+  * Revive debian/patches/56_dirsvc.dpatch; it's still not fixed upstream.
 
- -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Jul 2006 09:44:00 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Jul 2006 09:46:32 +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:48:16 2006
@@ -19,7 +19,7 @@
 #48_stdlib.dpatch
 53_usr_share_ppd_support.dpatch
 55_ppd_okidata_name.dpatch
-#56_dirsvc.dpatch
+56_dirsvc.dpatch
 #57_cupsaddsmb.dpatch
 #58_fixdestc.dpatch
 #59_de_docroot.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/56_dirsvc.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/56_dirsvc.dpatch	Mon Jul 24 07:48:16 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 56_dirsvc.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~/scheduler/dirsvc.c cupsys-1.2.1/scheduler/dirsvc.c
+--- cupsys-1.2.1~/scheduler/dirsvc.c	2006-06-11 11:41:06.000000000 +0000
++++ cupsys-1.2.1/scheduler/dirsvc.c	2006-06-11 11:50:51.000000000 +0000
+@@ -2521,7 +2521,7 @@
+ 
+ 	  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+ 	                   iface->hostname, iface->port,
+-			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s%s" :
++			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s" :
+ 			                                    "/printers/%s",
+ 			   p->name);
+ 	  snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\" %s\n",