r564: * Still run potodebconf after warning about templates.ll files.

[debhelper.git] / dh_installdebconf

diff --git a/dh_installdebconf b/dh_installdebconf
index 2b6bdc70a4050e02275e96249fb30ab7c7a103f6..2e22474d17380cea90aaaa342c0b999672b81dc8 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -26,22 +26,29 @@ Files named debian/package.config and debian/package.templates are
 installed into the DEBIAN directory in the package build directory.
 
 Note that if you use debconf, your package probably needs to depend on it
-(it will be added to ${misc:Depends by this program).
+(it will be added to ${misc:Depends} by this program).
+
+Note that for your config script to be called by dpkg, your postinst
+needs to source debconf's confmodule. dh_installdebconf does not
+install this statement into postinst automatically as it it too hard to
+do it right.
 
 =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
-L<debconf-mergetemplate(1)> and L<debconf-getlang(1)> for details.
+support to aid is working with them. It is best to keep the translations in
+.po files under debian/po, and merge them only at build time. See 
+L<po2debconf(1)> and L<debconf-getlang(1)> for details.
+
+This program will look to see if you have a debian/po directory and if so will
+automatically call L<po2debconf(1)> to generate a merged templates file. Or 
+if you have debian/templates.ll files, it will use the older 
+L<debconf-mergetemplate(1)> program to merge those together.
 
-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.
+Note that if your package has a debian/po directory it should build-depend on po-debconf.
 
 For example, if you have a German translation,
-debian/package.templates.de is merged with debian/package.templates.
+strings from debian/po/de.po are merged with debian/package.templates.
 
 =head1 OPTIONS
 
@@ -53,7 +60,8 @@ Do not modify postrm script.
 
 =item B<--> I<params>
 
-Pass the params to debconf-mergetemplate.
+Pass the params to po2debconf, if it is run or debconf-mergetemplate, if it
+is run.
 
 =back
 
@@ -81,10 +89,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
        
        if ($templates ne '') {
-               # Are there translated templates too?
+               # Are there old-style translated templates?
                my @trans=(glob("$templates.??"), glob("$templates.??_??"));
-               if (@trans) {
-                       complex_doit("debconf-mergetemplate @extraparams @trans $templates > $tmp/DEBIAN/templates");
+
+               # Look for po directory.
+               if (-d "debian/po") {
+                       if (@trans) {
+                               warning "ignoring debian/templates.ll files in favour of debian/po directory";
+                       }
+                       complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
+               }
+               elsif (@trans) {
+                       complex_doit("debconf-mergetemplate --drop-old-templates @extraparams @trans $templates > $tmp/DEBIAN/templates");
                        chmod 0644, "$tmp/DEBIAN/templates";
                        chown 0, 0, "$tmp/DEBIAN/templates";
                }