r1743: releasing version 4.2.32

[debhelper.git] / dh_installdebconf

diff --git a/dh_installdebconf b/dh_installdebconf
index b11ca7d8b8988929c320492b4b7606fc7e263539..8577214495fdc4bcd169c66cd5f09851045645ac 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -24,6 +24,12 @@ 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.script.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 filesmay be created 
+by other debhelper programs, and are shell script fragments.
 
 Note that if you use debconf, your package probably needs to depend on it
 (it will be added to ${misc:Depends} by this program).
@@ -83,23 +89,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
        }
 
-       if ($config ne '') {
-               doit("install", "-o", 0, "-g", 0, "-m", 755, "-p",
-                    $config, "$tmp/DEBIAN/config");
+       if (! is_udeb($package)) {
+               debhelper_script_subst($package, "config");
        }
        
        if ($templates ne '') {
                # Are there old-style translated templates?
                my @trans=(glob("$templates.??"), glob("$templates.??_??"));
 
+               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";
                        }
-                       else {
-                               complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
-                       }
+                       complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
                }
                elsif (@trans) {
                        complex_doit("debconf-mergetemplate --drop-old-templates @extraparams @trans $templates > $tmp/DEBIAN/templates");
@@ -112,13 +117,14 @@ 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";
        if ($config ne '' || $templates ne '') {
-               # I'm going with debconf 0.5 because it was the first
-               # "modern" one.
-               addsubstvar($package, "misc:Depends", "debconf", ">= 0.5");
+               addsubstvar($package, "misc:Depends", $debconfdep);
        }
        else {
-               addsubstvar($package, "misc:Depends", "debconf", ">= 0.5", 1); # remove
+               addsubstvar($package, "misc:Depends", $debconfdep, undef, 1); # remove
        }
        
        if (($config ne '' || $templates ne '') && ! $dh{NOSCRIPTS}) {
@@ -128,7 +134,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.