diff options
| author | joey <joey> | 2001-02-09 02:36:00 +0000 |
|---|---|---|
| committer | joey <joey> | 2001-02-09 02:36:00 +0000 |
| commit | 6b4abb3aacffc510aa200a24b748e0a130b756dd (patch) | |
| tree | 5c5295ccacd7a2096997caa81ba77366e130fe05 /dh_installdebconf | |
| parent | 3eb94dc22f123ba9c522b2b1c3f601b7622b7d49 (diff) | |
| download | debhelper-6b4abb3aacffc510aa200a24b748e0a130b756dd.tar.gz | |
r424: typo
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"; |