diff options
author | joey <joey> | 2001-01-29 21:17:56 +0000 |
---|---|---|
committer | joey <joey> | 2001-01-29 21:17:56 +0000 |
commit | a4b2194440fac0e24db7b0a5c5fa7aacf06e8645 (patch) | |
tree | 83513ed43dc039dcdf7f75e075c0f23213ea8dea | |
parent | c89efb0352c6c4af78bc8d5ebbe7cb3846ff89f3 (diff) |
r413: * dh_installdebconf: marge in templates with a .ll_LL extention,
they were previously ignored.
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | dh_installdebconf | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 72d32c39..a9cc8343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (2.2.17) unstable; urgency=medium + + * dh_installdebconf: marge in templates with a .ll_LL extention, + they were previously ignored. + + -- Joey Hess <joeyh@debian.org> Mon, 29 Jan 2001 13:05:21 -0800 + debhelper (2.2.16) unstable; urgency=medium * Bah, reverted that last change. It isn't useful because diff --git a/dh_installdebconf b/dh_installdebconf index ccf3074a..f491e295 100755 --- a/dh_installdebconf +++ b/dh_installdebconf @@ -21,7 +21,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) { if ($templates ne '') { # Are there translated templates too? - my @trans=glob("$templates.??"); + my @trans=(glob("$templates.??"), glob("$templates.??_??")); if (@trans) { complex_doit("debconf-mergetemplate @trans $templates > $TMP/DEBIAN/templates"); chmod 0644, "$TMP/DEBIAN/templates"; |