summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2003-02-25 00:33:45 +0000
committerjoey <joey>2003-02-25 00:33:45 +0000
commit52eff396c8a1595a3d2940ac70bf3cc2b9cec798 (patch)
tree9cac0709c391606ff280901096c651eb20e19d24
parent1331f43bd02122e6368c808e5b69ceefc6e37c53 (diff)
r575: * Removed vegistal substvars stuff from dh_inistallinit.
* Update debhelper(1).
-rw-r--r--debhelper.pod3
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_installinit6
3 files changed, 8 insertions, 8 deletions
diff --git a/debhelper.pod b/debhelper.pod
index 5a80de2..e1a589c 100644
--- 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 931467d..3b633d6 100644
--- 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 1eaffc0..d8b94d5 100755
--- 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);
- }
}
}