[Initscripts-ng-commits] r766 - in /branches/insserv-1.11.9/debian: ./ patches/

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Wed Jul 9 07:10:09 UTC 2008 

Author: kelmo-guest
Date: Wed Jul  9 07:10:09 2008
New Revision: 766

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=766
Log:
DO NOT RELEASE
* Discard patches no longer relevant to new upstream:
  - 32_debug_option.dpatch
  - 33_nosuse_scripts.dpatch
  - 40_segfault_virtprov.dpatch
  - 41_cleansystem.dpatch
  - 50_sign_warning.dpatch
  - 51_overwrite_output.dpatch
  - 52_shutdown_links.dpatch
  - 60_disable_cfgfilter_stat.dpatch
  - 64_missing_default_fields_fallback.dpatch
* Discard patches not applied in series:
  - 32_debug_option.dpatch
  - 34_debian_fixedscripts.dpatch
* Refresh patches that still apply to new upstream:
  - 10_nosuse.dpatch
  - 11_more_warnings.dpatch
  - 42_loopnochangemsg.dpatch
  - 62_warn_on_missing_required_fields.dpatch
  - 63_warn_on_missing_default_fields.dpatch

Removed:
    branches/insserv-1.11.9/debian/patches/32_debug_option.dpatch
    branches/insserv-1.11.9/debian/patches/33_nosuse_scripts.dpatch
    branches/insserv-1.11.9/debian/patches/34_debian_fixedscripts.dpatch
    branches/insserv-1.11.9/debian/patches/40_segfault_virtprov.dpatch
    branches/insserv-1.11.9/debian/patches/41_cleansystem.dpatch
    branches/insserv-1.11.9/debian/patches/50_sign_warning.dpatch
    branches/insserv-1.11.9/debian/patches/51_overwrite_output.dpatch
    branches/insserv-1.11.9/debian/patches/52_shutdown_links.dpatch
    branches/insserv-1.11.9/debian/patches/53_debugoutput.dpatch
    branches/insserv-1.11.9/debian/patches/60_disable_cfgfilter_stat.dpatch
    branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
Modified:
    branches/insserv-1.11.9/debian/changelog
    branches/insserv-1.11.9/debian/patches/00list
    branches/insserv-1.11.9/debian/patches/10_nosuse.dpatch
    branches/insserv-1.11.9/debian/patches/11_more_warnings.dpatch
    branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.dpatch
    branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.dpatch
    branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.dpatch

Modified: branches/insserv-1.11.9/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Wed Jul  9 07:10:09 2008
@@ -1,4 +1,6 @@
-insserv (1.11.0-10) UNRELEASED; urgency=low
+insserv (1.11.9-1) UNRELEASED; urgency=low
+
+  DO NOT RELEASE
 
   [ Petter Reinholdtsen ]
   * 
@@ -6,8 +8,27 @@
   [ Kel Modderman ]
   * Add Status field to description of each dpatch, to describe how each
     patch stands with respect to upstream inclusion.
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 02 Jun 2008 15:32:27 +1000
+  * Discard patches no longer relevant to new upstream:
+    - 32_debug_option.dpatch
+    - 33_nosuse_scripts.dpatch
+    - 40_segfault_virtprov.dpatch
+    - 41_cleansystem.dpatch
+    - 50_sign_warning.dpatch
+    - 51_overwrite_output.dpatch
+    - 52_shutdown_links.dpatch
+    - 60_disable_cfgfilter_stat.dpatch
+    - 64_missing_default_fields_fallback.dpatch
+  * Discard patches not applied in series:
+    - 32_debug_option.dpatch
+    - 34_debian_fixedscripts.dpatch
+  * Refresh patches that still apply to new upstream:
+    - 10_nosuse.dpatch
+    - 11_more_warnings.dpatch
+    - 42_loopnochangemsg.dpatch
+    - 62_warn_on_missing_required_fields.dpatch
+    - 63_warn_on_missing_default_fields.dpatch
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 09 Jul 2008 17:05:56 +1000
 
 insserv (1.11.0-9) unstable; urgency=low
 

Modified: branches/insserv-1.11.9/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/00list?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/00list (original)
+++ branches/insserv-1.11.9/debian/patches/00list Wed Jul  9 07:10:09 2008
@@ -1,15 +1,6 @@
 10_nosuse
 11_more_warnings
 31_debian_conf
-32_debug_option
-33_nosuse_scripts
-40_segfault_virtprov
-41_cleansystem
 42_loopnochangemsg
-50_sign_warning
-51_overwrite_output
-52_shutdown_links
-60_disable_cfgfilter_stat
 62_warn_on_missing_required_fields
 63_warn_on_missing_default_fields
-64_missing_default_fields_fallback

Modified: branches/insserv-1.11.9/debian/patches/10_nosuse.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/10_nosuse.dpatch?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/10_nosuse.dpatch (original)
+++ branches/insserv-1.11.9/debian/patches/10_nosuse.dpatch Wed Jul  9 07:10:09 2008
@@ -8,24 +8,14 @@
 Notes:               The debug symbol change might make sense to get included upstream.
 
 @DPATCH@
-diff -urNad insserv-1.10.0~/Makefile insserv-1.10.0/Makefile
---- insserv-1.10.0~/Makefile	2008-01-07 17:21:15.000000000 +0100
-+++ insserv-1.10.0/Makefile	2008-01-07 17:21:18.000000000 +0100
-@@ -11,7 +11,7 @@
- #DEBUG	 =	-DDEBUG=1
- #LOOPS	 =	-DIGNORE_LOOPS=1
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@
+ #DESTDIR =	/tmp/root
+ #DEBUG	 =	-DDEBUG=1 -Wpacked
  DEBUG	 =
 -ISSUSE	 =	-DSUSE
 +#ISSUSE	 =	-DSUSE
  DESTDIR	 =
- VERSION	 =	1.10.0
+ VERSION	 =	1.11.9
  DATE	 =	$(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
-@@ -25,7 +25,7 @@
- ifeq ($(ARCH),i386)
- 	  COPTS = -O2 -mcpu=i586 -mtune=i686
- else
--	  COPTS = -O2
-+	  COPTS = -O2 -g
- endif
- endif
- 	 CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \

Modified: branches/insserv-1.11.9/debian/patches/11_more_warnings.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/11_more_warnings.dpatch?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/11_more_warnings.dpatch (original)
+++ branches/insserv-1.11.9/debian/patches/11_more_warnings.dpatch Wed Jul  9 07:10:09 2008
@@ -4,14 +4,14 @@
 Make more issues visible by using -W in addition to -Wall.
 
 @DPATCH@
---- insserv-1.11.0.orig/Makefile
-+++ insserv-1.11.0/Makefile
-@@ -28,7 +28,7 @@
- 	  COPTS = -O2
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@
+ 	  COPTS = -g -O2
  endif
  endif
 -	 CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
 +	 CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
  		  $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe
  	  CLOOP = -falign-loops=0
- 	     CC = gcc
+ 	LDFLAGS = -Wl,-O,3,--relax

Modified: branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.dpatch?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.dpatch (original)
+++ branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.dpatch Wed Jul  9 07:10:09 2008
@@ -8,14 +8,14 @@
 Status: Not applied in version 1.11.2
 
 @DPATCH@
---- insserv-1.11.0.orig/insserv.c
-+++ insserv-1.11.0/insserv.c
-@@ -2647,7 +2647,7 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -2960,7 +2960,7 @@
+      */
      follow_all();
- 
      if (is_loop_detected() && !ignore)
 -	error("exiting now!\n");
 +	error("exiting without changing boot order!\n");
  
      /*
-      * Re-order some well known scripts to get
+      * Be sure that interactive scripts are the only member of

Modified: branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.dpatch?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.dpatch (original)
+++ branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.dpatch Wed Jul  9 07:10:09 2008
@@ -11,18 +11,14 @@
 test_broken_header test suite case exposes this situation.
 
 @DPATCH@
-diff -urNad insserv~/insserv.c insserv/insserv.c
---- insserv~/insserv.c	2008-05-19 23:36:39.000000000 +1000
-+++ insserv/insserv.c	2008-05-19 23:38:11.214013731 +1000
-@@ -1257,9 +1257,9 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -1292,7 +1292,7 @@
+ 	    error("exiting now!\n");
      }
  
- #ifndef USE_STOP_TAGS
--    if (verbose && (begin && end && (!provides || !required_start)))
-+    if (begin && end && (!provides || !required_start))
- #else  /* USE_STOP_TAGS */
--    if (verbose && (begin && end && (!provides || !required_start || !required_stop)))
-+    if (begin && end && (!provides || !required_start || !required_stop))
- #endif /* USE_STOP_TAGS */
+-    if (verbose && (begin && end && (!provides || (provides == empty) || !required_start || !required_stop)))
++    if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop))
      {
  	char *name = basename(path);
+ 	if (*name == 'S' || *name == 'K')

Modified: branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.dpatch?rev=766&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.dpatch (original)
+++ branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.dpatch Wed Jul  9 07:10:09 2008
@@ -13,32 +13,26 @@
 expose this situation.
 
 @DPATCH@
-diff -urNad insserv~/insserv.c insserv/insserv.c
---- insserv~/insserv.c	2008-05-19 23:41:03.000000000 +1000
-+++ insserv/insserv.c	2008-05-19 23:44:16.094012864 +1000
-@@ -1257,9 +1257,9 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -1292,7 +1292,8 @@
+ 	    error("exiting now!\n");
      }
  
- #ifndef USE_STOP_TAGS
--    if (begin && end && (!provides || !required_start))
-+    if (begin && end && (!provides || !required_start || !default_start))
- #else  /* USE_STOP_TAGS */
--    if (begin && end && (!provides || !required_start || !required_stop))
-+    if (begin && end && (!provides || !required_start || !required_stop || !default_start || !default_stop))
- #endif /* USE_STOP_TAGS */
+-    if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop))
++    if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop ||
++    			 !default_start || !default_stop))
      {
  	char *name = basename(path);
-@@ -1270,9 +1270,13 @@
- 	    warn("Missing entry for Provides: please add even if empty.\n");
- 	if (!required_start)
- 	    warn("Missing entry for Required-Start: please add even if empty.\n");
+ 	if (*name == 'S' || *name == 'K')
+@@ -1306,6 +1307,10 @@
+ 	    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 entry for Default-Start: please add even if empty.\n");
- #ifdef USE_STOP_TAGS
- 	if (!required_stop)
- 	    warn("Missing entry for Required-Stop: please add even if empty.\n");
++	    warn("missing `Default-Start:' entry: please add even if empty.\n");
 +	if (!default_stop)
-+	    warn("Missing entry for Default-Stop: please add even if empty.\n");
- #endif /* USE_STOP_TAGS */
++	    warn("missing `Default-Stop:' entry: please add even if empty.\n");
      }
  
+ #undef provides

More information about the Initscripts-ng-commits mailing list