summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2002-11-15 20:36:06 +0000
committerjoey <joey>2002-11-15 20:36:06 +0000
commitaa763af651938c335925cf97054c5411cc489625 (patch)
treee66772b90d89d0007f94da5197ff294e4225f0d1
parent7bf320dd5c5f4995c4a03d3c14c8d70d5443480e (diff)
r564: * Still run potodebconf after warning about templates.ll files.
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_installdeb1
-rwxr-xr-xdh_installdebconf4
3 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index fa04e3a..74a730d 100644
--- 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 69c66dd..2cbdce3 100755
--- 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 b11ca7d..2e22474 100755
--- 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");