diff options
Diffstat (limited to 'dh_installdebconf')
| -rwxr-xr-x | dh_installdebconf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dh_installdebconf b/dh_installdebconf index 7be03ca7..0392b810 100755 --- a/dh_installdebconf +++ b/dh_installdebconf @@ -22,7 +22,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if ($templates ne '') { # Are there translated templates too? +<<<<<<< dh_installdebconf + my @trans=glob("$templates.??", "$templates.??_??"); +======= my @trans=(glob("$templates.??"), glob("$templates.??_??")); +>>>>>>> 1.5 if (@trans) { complex_doit("debconf-mergetemplate @trans $templates > $tmp/DEBIAN/templates"); chmod 0644, "$tmp/DEBIAN/templates"; |