r413: * dh_installdebconf: marge in templates with a .ll_LL extention,

     they were previously ignored.

diff --git a/debian/changelog b/debian/changelog
index 72d32c39fd3b14400004037d83080030cebdcb2e..a9cc834301519846e80797acb32fb18f62cb456f 100644 (file)
--- 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 ccf3074aaef3df5ab052649bdccbb08f3e93d48c..f491e295f82997b354d04a33335937514fe47d60 100755 (executable)
--- 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";