r424: typo

diff --git a/dh_installdebconf b/dh_installdebconf
index 7be03ca7a0f200d415a5602a115ca208e8224901..0392b8103406b8957e2fef08bfb7ace659d9667a 100755 (executable)
--- 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 d77a524bb5916f5f9e151a99cffc6f319688f9c5..bb7e592b7898b1450a07a659b76b1a5e6f352c48 100644 (file)
--- 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