X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installdebconf;h=015e3e5fc1c9bf02cc9589c146091364180ed4fa;hb=c85747dc1875ed610886bf891b0bebd5579d81de;hp=420d23a34f5d762be3854bc324dc9dee5366b2cc;hpb=86f2aaedb73761e58b50f0f8bcc608e49204407c;p=debhelper.git

diff --git a/dh_installdebconf b/dh_installdebconf
index 420d23a..015e3e5 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_fixperms - fix permissions of files in package build directories
+dh_installdebconf - install files used by debconf in package build directories
 
 =cut
 
@@ -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
 
@@ -24,25 +24,37 @@ that works.
 
 Files named debian/package.config and debian/package.templates are
 installed into the DEBIAN directory in the package build directory.
+If a file named debian/package.config.debhelper exists, the contents
+of that file are merged into the config script as follows: If the script 
+exists, then anywhere in it that "#DEBHELPER#" appears, the text of the 
+.debhelper file is inserted. If the script does not exist, then a script 
+is generated from the .debhelper file. The .debhelper files may be created 
+by other debhelper programs, and are shell script fragments.
 
-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).
+
+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 automatically call debconf-mergetemplate and merge 
-templates on the fly if it finds your template files are accompnied
-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 +64,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");
@@ -67,16 +89,25 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
 	}
 
-	if ($config ne '') {
-		doit("install", "-o", 0, "-g", 0, "-m", 755, "-p",
-		     $config, "$tmp/DEBIAN/config");
+	if (! is_udeb($package)) {
+		debhelper_script_subst($package, "config");
 	}
 	
 	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");
+
+		umask(0022); # since I do a redirect below
+		
+		# 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";
 		}
@@ -86,14 +117,24 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 
-	if (($config ne ''|| $templates ne '') && ! $dh{NOSCRIPTS}) {
+	# I'm going with debconf 0.5 because it was the first
+	# "modern" one.
+	my $debconfdep="debconf (>= 0.5) | debconf-2.0";
+	if ($config ne '' || $templates ne '') {
+		addsubstvar($package, "misc:Depends", $debconfdep);
+	}
+	else {
+		addsubstvar($package, "misc:Depends", $debconfdep, undef, 1); # remove
+	}
+	
+	if (($config ne '' || $templates ne '') && ! $dh{NOSCRIPTS}) {
 		autoscript($package,"postrm","postrm-debconf");
 	}
 }
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.