[Initscripts-ng-commits] r125 - in /trunk/src/insserv/debian: changelog patches/20_overrides.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Sep  6 22:44:55 2006
New Revision: 125

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=125
Log:
Update 20_overrides.dpatch to new version of the source.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/20_overrides.dpatch

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=125&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Sep  6 22:44:55 2006
@@ -1,12 +1,3 @@
-insserv (1.08.0-3) unstable; urgency=low
-
-  * Change mountvirtfs to mountdevsubfs in all override files, to
-    use the new name instead of the obsolete name.
-  * the keymap override should not depend on $syslog, and neither should
-    keymap.sh itself (bug #386338).
-
- -- Petter Reinholdtsen <pere at debian.org>  Thu,  7 Sep 2006 00:18:12 +0200
-
 insserv (1.08.0-2) unstable; urgency=low
 
   * New patch 35_fixunused removing incorrect 'unused' flagg from a
@@ -29,6 +20,11 @@
   * Update standards-version to 2.7.2.  No changes needed.
   * Do not include 'klogd' in the $syslog facility, to avoid
     dependency loop.
+  * Change mountvirtfs to mountdevsubfs in all override files, to
+    use the new name instead of the obsolete name.
+  * The keymap override should not depend on $syslog, and neither should
+    keymap.sh itself (bug #386338).
+  * Update 20_overrides.dpatch to new version of the source.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  1 Apr 2006 18:35:05 +0200
 

Modified: trunk/src/insserv/debian/patches/20_overrides.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/20_overrides.dpatch?rev=125&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/20_overrides.dpatch (original)
+++ trunk/src/insserv/debian/patches/20_overrides.dpatch Wed Sep  6 22:44:55 2006
@@ -6,8 +6,8 @@
 ## DP: files.
 
 @DPATCH@
---- insserv-1.04.0.orig/insserv.c
-+++ insserv-1.04.0/insserv.c
+--- insserv-1.08.0/insserv.c	2006-02-06 16:45:54.000000000 +0100
++++ insserv/insserv.c	2006-09-07 00:38:06.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <fcntl.h>
  #include <sys/stat.h>
@@ -16,7 +16,7 @@
  #include <dirent.h>
  #include <regex.h>
  #include <errno.h>
-@@ -921,7 +922,7 @@
+@@ -945,7 +946,7 @@
      regcompiler(&reg.desc,      DESCRIPTION,    REG_EXTENDED|REG_ICASE|REG_NEWLINE);
  }
  
@@ -25,7 +25,7 @@
  {
      regmatch_t subloc[SUBNUM_SHD+1], *val = &subloc[SUBNUM-1], *shl = &subloc[SUBNUM_SHD-1];
      FILE *script;
-@@ -943,16 +944,6 @@
+@@ -967,16 +968,6 @@
      if (!script)
  	error("fopen(%s): %s\n", path, strerror(errno));
  
@@ -42,7 +42,7 @@
  #define COMMON_ARGS	buf, SUBNUM, subloc, 0
  #define COMMON_SHD_ARGS	buf, SUBNUM_SHD, subloc, 0
      while (fgets(buf, sizeof(buf), script)) {
-@@ -1042,10 +1033,107 @@
+@@ -1094,10 +1085,107 @@
  #undef default_start
  #undef default_stop
  #undef description