r522: * Set DH_ALWAYS_EXCLUDE=CVS and debhelper will exclude CVS directories

[debhelper.git] / dh_installdebconf

diff --git a/dh_installdebconf b/dh_installdebconf
index 2b6bdc70a4050e02275e96249fb30ab7c7a103f6..0d83eea0be70e15734b8b0fbcab8b3fe0cf7ad36 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -31,14 +31,14 @@ Note that if you use debconf, your package probably needs to depend on it
 =head1 LOCALIZED TEMPLATE FILES
 
 Debconf also supports localized template files, and this program has some
-support to aid working with them. You may find it easiest to keep the
-translations in separate files, and merge them only at build time. See
+support to aid working with them. It is best to keep the translations in
+separate files, and merge them only at build time. See 
 L<debconf-mergetemplate(1)> and L<debconf-getlang(1)> for details.
 
 This program will automatically call debconf-mergetemplate and merge 
 templates on the fly if it finds your template files are accompanied
 by translated files that have the same name as the template file, with a
-dot and a locale name repended.
+dot and a locale name prepended.
 
 For example, if you have a German translation,
 debian/package.templates.de is merged with debian/package.templates.
@@ -84,7 +84,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # Are there translated templates too?
                my @trans=(glob("$templates.??"), glob("$templates.??_??"));
                if (@trans) {
-                       complex_doit("debconf-mergetemplate @extraparams @trans $templates > $tmp/DEBIAN/templates");
+                       complex_doit("debconf-mergetemplate --drop-old-templates @extraparams @trans $templates > $tmp/DEBIAN/templates");
                        chmod 0644, "$tmp/DEBIAN/templates";
                        chown 0, 0, "$tmp/DEBIAN/templates";
                }