X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installdebconf;h=5a20ed79c402c76cfe44a0fd539c2785772fd39d;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=c25a779589760a6d9a055ae8824785363acf91da;hpb=104c724c4ac5172367bea345e5b500ce45dcf0cf;p=debhelper.git

diff --git a/dh_installdebconf b/dh_installdebconf
index c25a779..5a20ed7 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -15,36 +15,48 @@ 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
-files used by the debconf package into package build directories.
-
-It also automatically generates the postrm commands needed to
-interface with debconf. See L<dh_installdeb(1)> for an explanation of how
-that works.
-
-Files named debian/package.config and debian/package.templates are
-installed into the DEBIAN directory in the package build directory.
-If a file named debian/package.config.debhelper exists, the contents
-of that file are merged into the config script as follows: If the script 
-exists, then anywhere in it that "#DEBHELPER#" appears, the text of the 
-.debhelper file is inserted. If the script does not exist, then a script 
-is generated from the .debhelper file. The .debhelper files may be created 
-by other debhelper programs, and are shell script fragments.
+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 F<postrm> commands needed to interface
+with debconf. The commands are added to the maintainer scripts by
+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 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
+
+=over 4
+
+=item debian/I<package>.config
+
+This is the debconf F<config> script, and is installed into the F<DEBIAN>
+directory in the package build directory.
 
-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 postinst automatically as it it too hard to
-do it right.
+Inside the script, the token B<#DEBHELPER#> is replaced with
+shell script snippets generated by other debhelper commands.
 
-=head1 LOCALIZED TEMPLATE FILES
+=item debian/I<package>.templates
 
-This program will look to see if you have a debian/po directory and if so
-will automatically call L<po2debconf(1)> to generate a merged templates
-file containing the translations. For this to work, your package should
-build-depend on po-debconf.
+This is the debconf F<templates> file, and is installed into the F<DEBIAN>
+directory in the package build directory.
+
+=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 F<po-debconf>.
+
+=back
 
 =head1 OPTIONS
 
@@ -52,11 +64,11 @@ 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
 
@@ -105,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");