r553: * dh_installdebconf: Support po-debconf debian/po directories.

[debhelper.git] / dh_installdebconf

diff --git a/dh_installdebconf b/dh_installdebconf
index f6a73bab562c465379742d80db80347982cccbc2..be6fcabfa582b9fe83157158b6b33ab0388b85ce 100755 (executable)
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_installdebconf [debhelper options] [-n]
+B<dh_installdebconf> [S<I<debhelper options>>] [B<-n>] [S<B<--> I<params>>]
 
 =head1 DESCRIPTION
 
@@ -25,24 +25,25 @@ that works.
 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.
+Note that if you use debconf, your package probably needs to depend on it
+(it will be added to ${misc:Depends} by this program).
 
 =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 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.
+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.
 
-For example, if you have a German translation,
-debian/package.templates.de is merged with debian/package.templates.
+Note that if your package has a debian/po directory it should build-depend on po-debconf.
 
-If you use this feature, your package should build-depend on debconf-utils.
+For example, if you have a German translation,
+strings from debian/po/de.po are merged with debian/package.templates.
 
 =head1 OPTIONS
 
@@ -52,12 +53,22 @@ If you use this feature, your package should build-depend on debconf-utils.
 
 Do not modify postrm script.
 
+=item B<--> I<params>
+
+Pass the params to po2debconf, if it is run or debconf-mergetemplate, if it
+is run.
+
 =back
 
 =cut
 
 init();
 
+my @extraparams;
+if (defined($dh{U_PARAMS})) {
+       @extraparams=@{$dh{U_PARAMS}};
+}
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
        my $config=pkgfile($package,"config");
@@ -73,10 +84,20 @@ 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 @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";
+                       }
+                       else {
+                               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";
                }
@@ -86,7 +107,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
        }
 
-       if (($config ne ''|| $templates ne '') && ! $dh{NOSCRIPTS}) {
+       if ($config ne '' || $templates ne '') {
+               # I'm going with debconf 0.5 because it was the first
+               # "modern" one.
+               addsubstvar($package, "misc:Depends", "debconf", ">= 0.5");
+       }
+       else {
+               addsubstvar($package, "misc:Depends", "debconf", ">= 0.5", 1); # remove
+       }
+       
+       if (($config ne '' || $templates ne '') && ! $dh{NOSCRIPTS}) {
                autoscript($package,"postrm","postrm-debconf");
        }
 }