[Initscripts-ng-commits] r788 - in /branches/insserv-1.11.9/debian: changelog patches/62_warn_on_missing_required_fields.patch patches/63_warn_on_missing_default_fields.patch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jul 22 13:05:05 2008
New Revision: 788

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=788
Log:
Merge 63_warn_on_missing_default_fields.patch into
62_warn_on_missing_required_fields.patch.

Removed:
    branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.patch
Modified:
    branches/insserv-1.11.9/debian/changelog
    branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch

Modified: branches/insserv-1.11.9/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=788&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Tue Jul 22 13:05:05 2008
@@ -6,8 +6,6 @@
   * 
 
   [ Kel Modderman ]
-  * Add Status field to description of each dpatch, to describe how each
-    patch stands with respect to upstream inclusion.
   * Discard patches no longer relevant to new upstream:
     - 32_debug_option.dpatch
     - 33_nosuse_scripts.dpatch
@@ -29,6 +27,8 @@
     - 63_warn_on_missing_default_fields.dpatch
   * Convert patches to a quilt series, adjust debian/{rules,control}
     accordingly. Build-Depend on quilt.
+  * Merge 63_warn_on_missing_default_fields.patch into
+    62_warn_on_missing_required_fields.patch.
   * Add 70_test_suite_failed_count.patch to close delta between SUSE and
     Debian common test suite shlib.
   * Add 80_do_not_mangle_argv_pointer.patch to revert optimisation that
@@ -51,7 +51,7 @@
     unproperly replaced with empty Default-Start or Default-Stop.
   * Make test_adding_start() case a more realistic example.
 
- -- Kel Modderman <kel at otaku42.de>  Sat, 19 Jul 2008 16:36:06 +1000
+ -- Kel Modderman <kel at otaku42.de>  Tue, 22 Jul 2008 18:05:40 +1000
 
 insserv (1.11.0-9) unstable; urgency=low
 

Modified: branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch?rev=788&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch (original)
+++ branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch Tue Jul 22 13:05:05 2008
@@ -5,12 +5,30 @@
 ---
 --- a/insserv.c
 +++ b/insserv.c
-@@ -1292,7 +1292,7 @@
+@@ -1292,7 +1292,12 @@
  	    error("exiting now!\n");
      }
  
 -    if (verbose && (begin && end && (!provides || (provides == empty) || !required_start || !required_stop)))
-+    if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop))
++    if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop ||
++#ifdef SUSE
++	!default_start))
++#else
++	!default_start || !default_stop))
++#endif
      {
  	char *name = basename(path);
  	if (*name == 'S' || *name == 'K')
+@@ -1306,6 +1311,12 @@
+ 	    warn("missing `Required-Start:' entry: please add even if empty.\n");
+ 	if (!required_stop)
+ 	    warn("missing `Required-Stop:'  entry: please add even if empty.\n");
++	if (!default_start)
++	    warn("missing `Default-Start:' entry: please add even if empty.\n");
++#ifndef SUSE
++	if (!default_stop)
++	    warn("missing `Default-Stop:'  entry: please add even if empty.\n");
++#endif
+     }
+ 
+ #undef provides