X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=dh_installdebconf;h=ff49f8ea132bdf9f603df60425c819e12d8cb1b1;hb=758ce0bb1f;hp=9dc13bbf5b9f21aff1d24971a6b8c2c7027ff341;hpb=81a1cb9028b75304b0261dfd91ba04c0e6b07bb4;p=debhelper.git

diff --git a/dh_installdebconf b/dh_installdebconf
index 9dc13bb..ff49f8e 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -11,37 +11,52 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_installdebconf> [S<I<debhelper options>>] [B<-n>]
+B<dh_installdebconf> [S<I<debhelper options>>] [B<-n>] [S<B<--> I<params>>]
 
 =head1 DESCRIPTION
 
 dh_installdebconf is a debhelper program that is responsible for installing
-files used by the debconf package into package build directories.
+files used by debconf into package build directories.
 
-It also automatically generates the postrm commands needed to
-interface with debconf. See L<dh_installdeb(1)> for an explanation of how
-that works.
-
-Files named debian/package.config and debian/package.templates are
-installed into the DEBIAN directory in the package build directory.
+It also automatically generates the postrm commands needed to interface
+with debconf. The commands are added to the maintainer scripts by
+dh_installdeb. See L<dh_installdeb(1)> for an explanation of how that
+works.
 
 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 the postinst automatically as it it too
+hard to do it right.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.config
+
+This is the debconf config script, and is installed into the DEBIAN
+directory in the package build directory.
+
+Inside the script, the token B<#DEBHELPER#> is replaced with
+shell script snippets generated by other debhelper commands.
+
+=item debian/I<package>.templates
 
-=head1 LOCALIZED TEMPLATE FILES
+This is the debconf templates file, and is installed into the DEBIAN
+directory in the package build directory.
 
-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.
+=item debian/po/
 
-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.
+If this directory is present, this program will automatically use
+L<po2debconf(1)> to generate merged templates
+files that include the translations from there.
 
-For example, if you have a German translation,
-debian/package.templates.de is merged with debian/package.templates.
+For this to work, your package should build-depend on po-debconf.
+
+=back
 
 =head1 OPTIONS
 
@@ -51,12 +66,21 @@ debian/package.templates.de is merged with debian/package.templates.
 
 Do not modify postrm script.
 
+=item B<--> I<params>
+
+Pass the params to po2debconf.
+
 =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");
@@ -66,18 +90,20 @@ 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?
-		my @trans=(glob("$templates.??"), glob("$templates.??_??"));
-		if (@trans) {
-			complex_doit("debconf-mergetemplate @trans $templates > $tmp/DEBIAN/templates");
-			chmod 0644, "$tmp/DEBIAN/templates";
-			chown 0, 0, "$tmp/DEBIAN/templates";
+		# Are there old-style translated templates?
+		if (glob("$templates.??"), glob("$templates.??_??")) {
+			warning "Ignoring debian/templates.ll files. Switch to po-debconf!";
+		}
+
+		umask(0022); # since I do a redirect below
+		
+		if (-d "debian/po") {
+			complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
 		}
 		else {
 			doit("install", "-o", 0, "-g", 0, "-m", 644, "-p",
@@ -85,13 +111,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 
+	# I'm going with debconf 0.5 because it was the first
+	# "modern" one. udebs just need cdebconf.
+	my $debconfdep=is_udeb($package) ? "cdebconf-udeb" : "debconf (>= 0.5) | debconf-2.0";
 	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");
+		addsubstvar($package, "misc:Depends", $debconfdep);
 	}
 	else {
-		addsubstvar($package, "misc:Depends", "debconf", ">= 0.5", 1); # remove
+		addsubstvar($package, "misc:Depends", $debconfdep, undef, 1); # remove
 	}
 	
 	if (($config ne '' || $templates ne '') && ! $dh{NOSCRIPTS}) {
@@ -101,7 +128,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.