r564: * Still run potodebconf after warning about templates.ll files.

diff --git a/debian/changelog b/debian/changelog
index fa04e3a7d190e45e24afda2a93e84305ea1e1e13..74a730d25da8d6225abfbb6013beaffcd5ac7237 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (4.1.23) unstable; urgency=low
+
+  * Still run potodebconf after warning about templates.ll files.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Nov 2002 15:33:31 -0500
+
 debhelper (4.1.22) unstable; urgency=low
 
   * dh_install: Support autodest with non-debian/tmp sourcedirs.

diff --git a/dh_installdeb b/dh_installdeb
index 69c66ddc15fbd536705302bf3812ff1a20e91c87..2cbdce30fdb9e1241d3650d8e30008e4a1e4119e 100755 (executable)
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -60,7 +60,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        if (-f "debian/$ext$file.debhelper") {
                                # Add this into the script, where it has
                                # #DEBHELPER#
-                               # TODO: do internally, no perl fork?
                                complex_doit("perl -pe 's~#DEBHELPER#~qx{cat debian/$ext$file.debhelper}~eg' < $f > $tmp/DEBIAN/$file");
                        }
                        else {

diff --git a/dh_installdebconf b/dh_installdebconf
index b11ca7d8b8988929c320492b4b7606fc7e263539..2e22474d17380cea90aaaa342c0b999672b81dc8 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -97,9 +97,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        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");