Author: kelmo-guest
Date: Mon Jul 14 00:20:36 2008
New Revision: 770
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=770
Log:
Cleanup 64_missing_default_fields_fallback.dpatch to avoid touching
SUSE codepath.
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=770&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon Jul 14 00:20:36 2008
@@ -6,8 +6,10 @@
[ Kel Modderman ]
* Add Status field to description of each dpatch, to describe how each
patch stands with respect to upstream inclusion.
-
- -- Kel Modderman <[EMAIL PROTECTED]> Mon, 02 Jun 2008 15:32:27 +1000
+ * Cleanup 64_missing_default_fields_fallback.dpatch to avoid touching
+ SUSE codepath.
+
+ -- Kel Modderman <[EMAIL PROTECTED]> Mon, 14 Jul 2008 10:19:14 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified:
trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch?rev=770&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
(original)
+++ trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
Mon Jul 14 00:20:36 2008
@@ -10,10 +10,9 @@
test_no_default_start and test_no_default_stop expose these cases.
@DPATCH@
-diff -urNad insserv~/insserv.c insserv/insserv.c
---- insserv~/insserv.c 2008-05-20 09:03:51.156011876 +1000
-+++ insserv/insserv.c 2008-05-20 09:04:18.929013402 +1000
-@@ -2507,11 +2507,6 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -2493,11 +2493,6 @@
* Could be a none LSB script, use info from
current link scheme.
*/
script_inf.default_start = lvl2str(service->lvls);
@@ -25,7 +24,7 @@
}
#ifdef USE_STOP_TAGS
/*
-@@ -2554,9 +2549,6 @@
+@@ -2534,9 +2529,6 @@
* Could be a none LSB script, use info from
current link scheme.
*/
script_inf.default_stop = lvl2str(service->lvlk);
@@ -35,7 +34,7 @@
}
#endif /* USE_STOP_TAGS */
}
-@@ -2564,12 +2556,28 @@
+@@ -2544,12 +2536,28 @@
free(provides);
}
@@ -51,9 +50,8 @@
+ }
+#endif /* Not SUSE */
#ifdef USE_STOP_TAGS
-- if (!script_inf.default_stop || script_inf.default_start == empty)
+#ifdef SUSE
-+ if (!script_inf.default_stop || script_inf.default_stop == empty)
+ if (!script_inf.default_stop || script_inf.default_start == empty)
script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
+#else /* SUSE */
+ if (!script_inf.default_stop) {
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
