r1655: * Added udeb support, as pioneered by di-packages-build. Understands

[debhelper.git] / dh_installdebconf

diff --git a/dh_installdebconf b/dh_installdebconf
index b11ca7d8b8988929c320492b4b7606fc7e263539..ebf6a13123090c0943bf5e24711fb327fba30c8d 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -83,7 +83,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
        }
 
-       if ($config ne '') {
+       if (! is_udeb($package) && $config ne '') {
                doit("install", "-o", 0, "-g", 0, "-m", 755, "-p",
                     $config, "$tmp/DEBIAN/config");
        }
@@ -92,14 +92,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # 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 +112,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 +129,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.