From 6b4abb3aacffc510aa200a24b748e0a130b756dd Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Fri, 9 Feb 2001 02:36:00 +0000
Subject: [PATCH 1/1] r424: typo

---
 dh_installdebconf | 4 ++++
 dh_installman.1   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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";
diff --git a/dh_installman.1 b/dh_installman.1
index d77a524..bb7e592 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
-- 
2.39.2