[Pkg-sysvinit-commits] r1644 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-08-26 19:51:02 +0000 (Wed, 26 Aug 2009)
New Revision: 1644

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
Log:
Make initscripts depend on sysv-rc | file-rc.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-08-26 19:48:49 UTC (rev 1643)
+++ sysvinit/trunk/debian/changelog	2009-08-26 19:51:02 UTC (rev 1644)
@@ -21,13 +21,14 @@
     upgrades from the insserv package to the sysv-rc package.  Depend
     on insserv (>> 1.12.0-10) for this, and Break insserv (<=
     1.12.0-10) to make sure insserv is upgraded first when both
-    sysv-rc and insserv is installed.  Migration is a one-way process,
-    enabled after a debconf question during upgrades when it is safe
-    to do so.  Checks previously done by update-bootsystem-insserv are
-    now only done once in sysv-rc postinst (Closes: #538934).  The
-    change make it possible to remove both sysv-rc and insserv
-    (Closes: #538959) if other packages want to take over the boot
-    sequencing resposibility.
+    sysv-rc and insserv is installed.  Let initscripts depend on
+    sysv-rc | file-rc to make sure they are installed first.
+    Migration is a one-way process, enabled after a debconf question
+    during upgrades when it is safe to do so.  Checks previously done
+    by update-bootsystem-insserv are now only done once in sysv-rc
+    postinst (Closes: #538934).  The change make it possible to remove
+    both sysv-rc and insserv (Closes: #538959) if other packages want
+    to take over the boot sequencing resposibility.
   * Rewrite initscripts postinst to always use the update-rc.d script
     instead of the legacy updatercd() function which was used as a
     speed optimization no longer relevant when dependency based boot

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2009-08-26 19:48:49 UTC (rev 1643)
+++ sysvinit/trunk/debian/control	2009-08-26 19:51:02 UTC (rev 1644)
@@ -51,7 +51,7 @@
 
 Package: initscripts
 Architecture: any
-Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-39)
+Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-39), sysv-rc | file-rc
 Recommends: psmisc, e2fsprogs
 Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1)
 Replaces: libc6, libc6.1, libc0.1, libc0.3