X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installdebconf;h=5a20ed79c402c76cfe44a0fd539c2785772fd39d;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=ff49f8ea132bdf9f603df60425c819e12d8cb1b1;hpb=a243946176b92b5fafd84f43d5a455551cf27210;p=debhelper.git

diff --git a/dh_installdebconf b/dh_installdebconf
index ff49f8e..5a20ed7 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -15,20 +15,20 @@ B<dh_installdebconf> [S<I<debhelper options>>] [B<-n>] [S<B<--> I<params>>]
 
 =head1 DESCRIPTION
 
-dh_installdebconf is a debhelper program that is responsible for installing
+B<dh_installdebconf> is a debhelper program that is responsible for installing
 files used by debconf into package build directories.
 
-It also automatically generates the postrm commands needed to interface
+It also automatically generates the F<postrm> commands needed to interface
 with debconf. The commands are added to the maintainer scripts by
-dh_installdeb. See L<dh_installdeb(1)> for an explanation of how that
+B<dh_installdeb>. See L<dh_installdeb(1)> for an explanation of how that
 works.
 
 Note that if you use debconf, your package probably needs to depend on it
-(it will be added to ${misc:Depends} by this program).
+(it will be added to B<${misc:Depends}> by this program).
 
-Note that for your config script to be called by dpkg, your postinst
-needs to source debconf's confmodule. dh_installdebconf does not
-install this statement into the postinst automatically as it it too
+Note that for your config script to be called by B<dpkg>, your F<postinst>
+needs to source debconf's confmodule. B<dh_installdebconf> does not
+install this statement into the F<postinst> automatically as it is too
 hard to do it right.
 
 =head1 FILES
@@ -37,7 +37,7 @@ hard to do it right.
 
 =item debian/I<package>.config
 
-This is the debconf config script, and is installed into the DEBIAN
+This is the debconf F<config> script, and is installed into the F<DEBIAN>
 directory in the package build directory.
 
 Inside the script, the token B<#DEBHELPER#> is replaced with
@@ -45,16 +45,16 @@ shell script snippets generated by other debhelper commands.
 
 =item debian/I<package>.templates
 
-This is the debconf templates file, and is installed into the DEBIAN
+This is the debconf F<templates> file, and is installed into the F<DEBIAN>
 directory in the package build directory.
 
-=item debian/po/
+=item F<debian/po/>
 
 If this directory is present, this program will automatically use
 L<po2debconf(1)> to generate merged templates
 files that include the translations from there.
 
-For this to work, your package should build-depend on po-debconf.
+For this to work, your package should build-depend on F<po-debconf>.
 
 =back
 
@@ -64,11 +64,11 @@ For this to work, your package should build-depend on po-debconf.
 
 =item B<-n>, B<--noscripts>
 
-Do not modify postrm script.
+Do not modify F<postrm> script.
 
 =item B<--> I<params>
 
-Pass the params to po2debconf.
+Pass the params to B<po2debconf>.
 
 =back
 
@@ -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");