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 | |
| parent | 3eb94dc22f123ba9c522b2b1c3f601b7622b7d49 (diff) | |
r424: typo
| -rwxr-xr-x | dh_installdebconf | 4 | ||||
| -rw-r--r-- | dh_installman.1 | 2 |
2 files changed, 5 insertions, 1 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"; diff --git a/dh_installman.1 b/dh_installman.1 index d77a524b..bb7e592b 100644 --- a/dh_installman.1 +++ b/dh_installman.1 @@ -7,7 +7,7 @@ dh_installman \- install man pages into package build directories .SH "DESCRIPTION" dh_installman is a debhelper program that is responsible for installing man pages into the correct locations in package build directories. You tell -it what man pages go in your package(s), and it figure out where to install +it what man pages go in your package(s), and it figures out where to install them based on the section field in their .TH line and their filename extention. .P |