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

[Martin Pitt]

Author: mpitt
Date: Fri Jan 13 15:10:59 2006
New Revision: 107

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/48_stdlib.dpatch
Log:
* New SVN release taken from r4892.
* debian/patches/48_stdlib.dpatch: Adapted to new upstream version.


Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Fri Jan 13 15:10:59 2006
@@ -1,16 +1,18 @@
-cupsys (1.1.99.b1.r4885-2) UNRELEASED-experimental; urgency=low
+cupsys (1.1.99.b1.r4892-1) UNRELEASED-experimental; urgency=low
 
   [ Kenshi Muto ]
   *
 
   [ Martin Pitt ]
+  * New SVN release taken from r4892.
+  * debian/patches/48_stdlib.dpatch: Adapted to new upstream version.
   * debian/cupsys.init.d:
     - Fix arguments of start-stop-daemon and remove the hideous kill
       algorithm.
     - Ensure that /var/run/cupsd exists; this makes the init script work with
       /var/run mounted on a tmpfs.
 
- -- Martin Pitt <mpitt at debian.org>  Wed, 11 Jan 2006 19:33:48 +0100
+ -- Martin Pitt <mpitt at debian.org>  Fri, 13 Jan 2006 15:55:50 +0100
 
 cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/patches/48_stdlib.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/48_stdlib.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/48_stdlib.dpatch	Fri Jan 13 15:10:59 2006
@@ -18,33 +18,6 @@
  
  
  /*
-diff -urNad cupsys-1.1.99.b1.r4748~/cups/auth.c cupsys-1.1.99.b1.r4748/cups/auth.c
---- cupsys-1.1.99.b1.r4748~/cups/auth.c	2005-11-13 05:25:56.281194005 +0000
-+++ cupsys-1.1.99.b1.r4748/cups/auth.c	2005-11-13 05:25:57.359029045 +0000
-@@ -37,9 +37,9 @@
- #include "cups.h"
- #include "ipp.h"
- #include "language.h"
-+#include <stdlib.h>
- #include "string.h"
- #include "debug.h"
--#include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
-diff -urNad cupsys-1.1.99.b1.r4748~/cups/dest.c cupsys-1.1.99.b1.r4748/cups/dest.c
---- cupsys-1.1.99.b1.r4748~/cups/dest.c	2005-11-13 05:25:56.283193699 +0000
-+++ cupsys-1.1.99.b1.r4748/cups/dest.c	2005-11-13 05:25:57.359029045 +0000
-@@ -43,8 +43,8 @@
- 
- #include "cups.h"
- #include "language.h"
--#include "string.h"
- #include <stdlib.h>
-+#include "string.h"
- #include <ctype.h>
- 
- 
 diff -urNad cupsys-1.1.99.b1.r4748~/cups/dir.c cupsys-1.1.99.b1.r4748/cups/dir.c
 --- cupsys-1.1.99.b1.r4748~/cups/dir.c	2005-11-13 05:25:56.284193546 +0000
 +++ cupsys-1.1.99.b1.r4748/cups/dir.c	2005-11-13 05:25:57.409021394 +0000