diff options
| author | joey <joey> | 2002-05-19 03:06:41 +0000 |
|---|---|---|
| committer | joey <joey> | 2002-05-19 03:06:41 +0000 |
| commit | 6acd7f22222118dc5f51c251bd0078edbe280e87 (patch) | |
| tree | 141f8d946118eb548ad6e19b6a62dd63bf398763 /dh_installdebconf | |
| parent | 822faec6d81321d23b3e75c018f0308fd006d1b2 (diff) | |
r522: * Set DH_ALWAYS_EXCLUDE=CVS and debhelper will exclude CVS directories
from processing by any command that takes a -X option, and dh_builddeb
will also go in and rm -rf any that still sneak into the build tree.
* dh_install: A patch from Eric Dorland <eric@debian.org> adds support for
--sourcedir, which allows debian/package.files files to be moved over to
debian/package.install, and just work. Closes: #146847
* dh_movefiles: don't do file tests in no-act mode. Closes: #144573
* dh_installdebconf: pass --drop-old-templates to debconf-mergetemplate.
Means debhelper has to depend on debconf-utils 1.1.1.
Diffstat (limited to 'dh_installdebconf')
| -rwxr-xr-x | dh_installdebconf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dh_installdebconf b/dh_installdebconf index 2b6bdc70..0d83eea0 100755 --- 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"; } |