r547: * Use invoke-rc.d always now that it is in policy. Fall back to old behavior

     if invoke-rc.d is not present, so versioned deps on sysvinit are not
     needed.

1 files changed, 3 insertions, 20 deletions

diff --git a/dh_installinit b/dh_installinit
index b20a1114..c5652c45 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -30,12 +30,6 @@ If a file named debian/package.default exists, then it is installed into
 etc/default/package in the package build directory, with "package" replaced
 by the package name.
 
-Historically this program generates postrm and prerm commands that run the
-init scripts by hand. In V4 mode, it uses the invoke-rc.d program instead.
-See L<debhelper(1)> for details about V4 mode. If you decide to use this, you
-should make your package depend on sysvinit (>= 2.80-1) (this dependency is
-added to ${misc:Depends} by this program in V4 mode).
-
 =head1 OPTIONS
 
 =over 4
@@ -141,30 +135,19 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 		my $substvaradded=0;
 		if (! $dh{NOSCRIPTS}) {
-			# In v4 mode, use invoke-rc.d versions of the
-			# autoscripts; prior to that use the old,
-			# manual-invoking versions.
-			my $tailstr="";
-			if (! compat(3)) {
-				$tailstr="-invoke";
-				addsubstvar($package, "misc:Depends", "sysvinit", ">= 2.80-1");
-				$substvaradded=1;
-			}
-			autoscript($package,"postinst", "postinst-init$tailstr",
+			autoscript($package,"postinst", "postinst-init",
 				"s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
 			# -r on the command line sets R_FLAG. If it's set,
 			# there  is no restart on upgrade, so don't stop
 			# daemon. (It's ok that it's always started.)
 			if ($dh{R_FLAG}) {
-				autoscript($package,"prerm","prerm-init-norestart$tailstr",
+				autoscript($package,"prerm","prerm-init-norestart",
 					"s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
 			}
 			else {
-				autoscript($package,"prerm","prerm-init$tailstr",
+				autoscript($package,"prerm","prerm-init",
 					"s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
 			}
-			# This script just removes the links, so it's the
-			# same for all varients.
 			autoscript($package,"postrm","postrm-init",
 				"s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
 		}