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

[Martin Pitt]

Author: mpitt
Date: Fri Sep 15 17:51:20 2006
New Revision: 376

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/56_dirsvc.dpatch

Log:
* debian/patches/56_dirsvc.dpatch: Update patch so that a patch/unpatch
  cycle restores the source properly instead of breaking dirsvc.c in two
  different places.

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Fri Sep 15 17:51:20 2006
@@ -1,3 +1,11 @@
+cupsys (1.2.3-1ubuntu2) edgy; urgency=low
+
+  * debian/patches/56_dirsvc.dpatch: Update patch so that a patch/unpatch
+    cycle restores the source properly instead of breaking dirsvc.c in two
+    different places.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Fri, 15 Sep 2006 19:50:29 +0200
+
 cupsys (1.2.3-1ubuntu1) edgy; urgency=low
 
   * Merge recent bug fixes from Debian (see Kenshi's changes in 1.2.3-1 for

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/56_dirsvc.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/56_dirsvc.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/56_dirsvc.dpatch	Fri Sep 15 17:51:20 2006
@@ -5,11 +5,11 @@
 ## DP: No description.
 
 @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 @@
- 
+diff -urNad cups-1.2-ubuntu~/scheduler/dirsvc.c cups-1.2-ubuntu/scheduler/dirsvc.c
+--- cups-1.2-ubuntu~/scheduler/dirsvc.c	2006-09-15 19:49:10.000000000 +0200
++++ cups-1.2-ubuntu/scheduler/dirsvc.c	2006-09-15 19:49:12.000000000 +0200
+@@ -2613,7 +2613,7 @@
+ 	{
  	  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
  	                   iface->hostname, iface->port,
 -			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s%s" :