Fix build system auto-selection breakage.

[debhelper.git] / dh_installdebconf

diff --git a/dh_installdebconf b/dh_installdebconf
index 015e3e5fc1c9bf02cc9589c146091364180ed4fa..ff49f8ea132bdf9f603df60425c819e12d8cb1b1 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -16,45 +16,47 @@ 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.
+files used by debconf 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.
+It also automatically generates the 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
+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).
 
 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.
+install this statement into the postinst automatically as it it too
+hard to do it right.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.config
+
+This is the debconf config script, and is installed into the DEBIAN
+directory in the package build directory.
 
-=head1 LOCALIZED TEMPLATE FILES
+Inside the script, the token B<#DEBHELPER#> is replaced with
+shell script snippets generated by other debhelper commands.
 
-Debconf also supports localized template files, and this program has some
-support to aid is working with them. It is best to keep the translations in
-.po files under debian/po, and merge them only at build time. See 
-L<po2debconf(1)> and L<debconf-getlang(1)> for details.
+=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. Or 
-if you have debian/templates.ll files, it will use the older 
-L<debconf-mergetemplate(1)> program to merge those together.
+This is the debconf templates file, and is installed into the DEBIAN
+directory in the package build directory.
 
-Note that if your package has a debian/po directory it should build-depend on po-debconf.
+=item debian/po/
 
-For example, if you have a German translation,
-strings from debian/po/de.po are merged with debian/package.templates.
+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.
+
+=back
 
 =head1 OPTIONS
 
@@ -66,8 +68,7 @@ Do not modify postrm script.
 
 =item B<--> I<params>
 
-Pass the params to po2debconf, if it is run or debconf-mergetemplate, if it
-is run.
+Pass the params to po2debconf.
 
 =back
 
@@ -95,22 +96,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        
        if ($templates ne '') {
                # Are there old-style translated templates?
-               my @trans=(glob("$templates.??"), glob("$templates.??_??"));
+               if (glob("$templates.??"), glob("$templates.??_??")) {
+                       warning "Ignoring debian/templates.ll files. Switch to po-debconf!";
+               }
 
                umask(0022); # since I do a redirect below
                
-               # Look for po directory.
                if (-d "debian/po") {
-                       if (@trans) {
-                               warning "ignoring debian/templates.ll files in favour of debian/po directory";
-                       }
                        complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
                }
-               elsif (@trans) {
-                       complex_doit("debconf-mergetemplate --drop-old-templates @extraparams @trans $templates > $tmp/DEBIAN/templates");
-                       chmod 0644, "$tmp/DEBIAN/templates";
-                       chown 0, 0, "$tmp/DEBIAN/templates";
-               }
                else {
                        doit("install", "-o", 0, "-g", 0, "-m", 644, "-p",
                             $templates, "$tmp/DEBIAN/templates");
@@ -118,8 +112,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        # I'm going with debconf 0.5 because it was the first
-       # "modern" one.
-       my $debconfdep="debconf (>= 0.5) | debconf-2.0";
+       # "modern" one. udebs just need cdebconf.
+       my $debconfdep=is_udeb($package) ? "cdebconf-udeb" : "debconf (>= 0.5) | debconf-2.0";
        if ($config ne '' || $templates ne '') {
                addsubstvar($package, "misc:Depends", $debconfdep);
        }