summaryrefslogtreecommitdiff
path: root/dh_installdebconf
diff options
context:
space:
mode:
authorjoey <joey>2001-02-09 02:36:00 +0000
committerjoey <joey>2001-02-09 02:36:00 +0000
commit6b4abb3aacffc510aa200a24b748e0a130b756dd (patch)
tree5c5295ccacd7a2096997caa81ba77366e130fe05 /dh_installdebconf
parent3eb94dc22f123ba9c522b2b1c3f601b7622b7d49 (diff)
r424: typo
Diffstat (limited to 'dh_installdebconf')
-rwxr-xr-xdh_installdebconf4
1 files changed, 4 insertions, 0 deletions
diff --git a/dh_installdebconf b/dh_installdebconf
index 7be03ca..0392b81 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";