diff options
| -rwxr-xr-x | dh_installdebconf | 3 | ||||
| -rwxr-xr-x | dh_installxfonts | 4 | ||||
| -rwxr-xr-x | dh_perl | 2 | ||||
| -rwxr-xr-x | dh_python | 2 | ||||
| -rw-r--r-- | doc/PROGRAMMING | 7 |
5 files changed, 4 insertions, 14 deletions
diff --git a/dh_installdebconf b/dh_installdebconf index ff49f8ea..3e51f8ee 100755 --- a/dh_installdebconf +++ b/dh_installdebconf @@ -117,9 +117,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if ($config ne '' || $templates ne '') { addsubstvar($package, "misc:Depends", $debconfdep); } - else { - addsubstvar($package, "misc:Depends", $debconfdep, undef, 1); # remove - } if (($config ne '' || $templates ne '') && ! $dh{NOSCRIPTS}) { autoscript($package,"postrm","postrm-debconf"); diff --git a/dh_installxfonts b/dh_installxfonts index 21e7fcec..25e073bc 100755 --- a/dh_installxfonts +++ b/dh_installxfonts @@ -82,10 +82,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) { addsubstvar($package, "misc:Depends", "xfonts-utils"); } - else { - # remove - addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1); - } } =head1 SEE ALSO @@ -90,8 +90,6 @@ use constant XS_MODULE => 4; foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); - delsubstvar($package, "perl:Depends"); # for idempotency - # Check also for alternate locations given on the command line my @dirs = grep -d, map "$tmp/$_", $vendorlib, $vendorarch, @ARGV; @@ -135,8 +135,6 @@ use constant SO_MODULE_NONSTANDARD => 16; foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp = tmpdir($package); - delsubstvar($package, "python:Depends"); - my @dirs = ("usr/lib/site-python", "usr/lib/$package", "usr/share/$package", "usr/lib/games/$package", "usr/share/games/$package", @ARGV ); my @dirs_so = ("usr/lib/site-python", @ARGV ); diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING index 0fca4722..ca76b9c9 100644 --- a/doc/PROGRAMMING +++ b/doc/PROGRAMMING @@ -216,9 +216,10 @@ addsubstvar($package, $substvar, $deppackage, $verinfo, $remove) - version info for the package (optional) (ie: ">= 1.1") - if this last parameter is passed, the thing that would be added is removed instead. This can be useful to ensure that a debhelper - command is idempotent. Note that without this parameter, if you - call the function twice with the same values it will only add one - item to the substvars file. + command is idempotent. (However, we generally don't bother, + and rely on the user calling dh_prep.) Note that without this + parameter, if you call the function twice with the same values it + will only add one item to the substvars file. delsubstvar($package, $substvar) This function removes the entire line for the substvar from the package's shlibs file. |