r575: * Removed vegistal substvars stuff from dh_inistallinit.

   * Update debhelper(1).

diff --git a/debhelper.pod b/debhelper.pod
index 5a80de2fcca1e601659300e18dfed484b7e9b9ed..e1a589c74ed6dd07ac3f859b1f192000b3d09511 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -293,8 +293,7 @@ the generated dependancy line in the shlibs file.
 =item -
 
 You are encouraged to put the new ${misc:Depends} into debian/control to
-suppliment the ${shlibs:Depends} field. In particular, the new
-dh_installinit feature needs a versioned dependency on sysvinit.
+suppliment the ${shlibs:Depends} field.
 
 =item -
 

diff --git a/debian/changelog b/debian/changelog
index 931467da79e958efc8b350c757f2deb3f6fa884d..3b633d6ff514ac3c74e695b295208b4f52fb3b1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.1.34) unstable; urgency=low
+
+  * Removed vegistal substvars stuff from dh_inistallinit.
+  * Update debhelper(1).
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 24 Feb 2003 19:34:44 -0500
+
 debhelper (4.1.33) unstable; urgency=low
 
   * wiggy didn't take my hint about making update-modules send warnings to

diff --git a/dh_installinit b/dh_installinit
index 1eaffc0cc280072346723b4067b11ac58a16d4ee..d8b94d534e8f49e0b3127335335dae2886af1e5a 100755 (executable)
--- a/dh_installinit
+++ b/dh_installinit
@@ -138,7 +138,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        $params="defaults";
                }
 
-               my $substvaradded=0;
                if (! $dh{NOSCRIPTS}) {
                        if (! $dh{NO_START}) {
                                # update-rc.d, and start script
@@ -166,11 +165,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        autoscript($package,"postrm","postrm-init",
                                "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
                }
-
-               if (! $substvaradded) {
-                       # Remove it, for idemotency's sake.
-                       addsubstvar($package, "misc:Depends", "sysvinit", ">= 2.80-1", 1);
-               }
        }
 }