Fix build system auto-selection breakage.

[debhelper.git] / dh_gconf

diff --git a/dh_gconf b/dh_gconf
index 6275b734cd1bd3cdae6971fa72f56efa076ade61..514aae7972ba2d32db07214412a59b13cad586fe 100755 (executable)
--- a/dh_gconf
+++ b/dh_gconf
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_gconf> [S<I<debhelper options>>] [B<-p<package>>]
+B<dh_gconf> [S<I<debhelper options>>] [B<--priority=<number>>]
 
 =head1 DESCRIPTION
 
@@ -22,23 +22,25 @@ It automatically generates the postinst and prerm fragments needed
 to register and unregister the schemas in usr/share/gconf/schemas, using
 gconf-schemas.
 
-If a file named debian/package.gconf-defaults exists, then it is
-installed into usr/share/gconf/defaults/10_package in the package build
-directory, with "package" replaced by the package name. Some postinst and
-postrm fragments will be generated to launch update-gconf-defaults. The
-syntax of this file consists of lines containing the key name, some
-white space, and the key value, which can be an integer, a boolean, a
-float, a string or a list of strings. Example:
+An appropriate dependency on gconf2 will be generated in ${misc:Depends}.
 
-  /apps/myprogram/frob_number  42
-  /apps/myprogram/do_foo       true
-  /apps/myprogram/priority     1.25
-  /apps/myprogram/name         "Gotcha !"
-  /apps/myprogram/names                [Ha ha!,Let's keep serious,Ho ho!]
+=head1 FILES
 
-The gconf-schemas and update-gconf-defaults scripts are provided by the
-gconf2 package. An appropriate dependency will be generated in
-${misc:Depends}.
+=over 4
+
+=item debian/I<package>.gconf-defaults
+
+Installed into usr/share/gconf/defaults/10_package in the package build
+directory, with "I<package>" replaced by the package name. Some postinst
+and postrm fragments will be generated to run update-gconf-defaults.
+
+=item debian/I<package>.gconf-mandatory
+
+Installed into usr/share/gconf/mandatory/10_package in the package build
+directory, with "I<package>" replaced by the package name, and similar
+postinst and postrm fragments will be generated.
+
+=back
 
 =head1 OPTIONS
 
@@ -47,9 +49,11 @@ ${misc:Depends}.
 =item B<--priority> I<priority>
 
 Use I<priority> (which should be a 2-digit number) as the defaults
-priority instead of 10. Children distributions are encouraged to use 20
-for their branding, CDD distributions to use 50, and site-specific
-packages should use 90 or more.
+priority instead of 10. Higher values than ten can be used by 
+derived distributions (20), CDD distributions (50), or site-specific
+packages (90).
+
+=back
 
 =cut
 
@@ -64,13 +68,21 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
        
        my $gconf_dep = 0;
+       my $mandatory = pkgfile($package, "gconf-mandatory");
+       if ($mandatory ne '') {
+               doit("mkdir","-p","$tmp/usr/share/gconf/mandatory");
+               doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package");
+               autoscript($package,"postinst","postinst-gconf-defaults","s%#OPT#%--mandatory%");
+               addsubstvar($package, "misc:Depends", "gconf2 (>= 2.24.0-5)");
+               $gconf_dep = 1;
+       }
        my $defaults = pkgfile($package,"gconf-defaults");
        if ($defaults ne '') {
                doit("mkdir","-p","$tmp/usr/share/gconf/defaults");
                doit("install","-p","-m644",$defaults,"$tmp/usr/share/gconf/defaults/${priority}_$package");
-               autoscript($package,"postinst","postinst-gconf-defaults");
-               autoscript($package,"postrm","postrm-gconf-defaults");
-               addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)");
+               autoscript($package,"postinst","postinst-gconf-defaults","s%#OPT#%%");
+               autoscript($package,"postrm","postrm-gconf-defaults","s%#OPT#%%");
+               addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)") unless $gconf_dep;
                $gconf_dep = 1;
        }
 
@@ -90,7 +102,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if ($schemas ne '') {
                        autoscript($package,"postinst","postinst-gconf","s%#SCHEMAS#%$schemas%");
                        autoscript($package,"prerm","prerm-gconf","s%#SCHEMAS#%$schemas%");
-                       autoscript($package,"postrm","postrm-gconf","s%#SCHEMAS#%$schemas%");
                        addsubstvar($package, "misc:Depends", "gconf2 (>= 2.10.1-2)") unless $gconf_dep;
                }
        }