Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_gconf

diff --git a/dh_gconf b/dh_gconf
index 6c6aa6d92e1e302cfa1b4324d6aa0c4983ec4a7d..84a6a6cc91977f2cd95cba6d883f0c4d0ffbfe14 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
 
@@ -19,20 +19,54 @@ dh_gconf is a debhelper program that is responsible for registering
 GConf schemas.
 
 It automatically generates the postinst and prerm fragments needed
-to register and unregister the schemas in usr/share/gconf/schemas.
-These fragments will use gconftool-2, so the package should depend on
-gconf2. This program will add an appropriate dependency to ${misc:Depends}.
+to register and unregister the schemas in usr/share/gconf/schemas, using
+gconf-schemas.
 
-The postinst script will also signal gconfd-2 so that the newly installed
-schemas are available straight away.
+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 gconf-schemas and update-gconf-defaults scripts are provided by the
+gconf2 package. An appropriate dependency will be generated in
+${misc:Depends}.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<--priority> I<priority>
+
+Use I<priority> (which should be a 2-digit number) as the defaults
+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
 
 init();
 
+my $priority=10;
+if (defined $dh{PRIORITY}) {
+       $priority=$dh{PRIORITY};
+}
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
+       
+       my $gconf_dep = 0;
+       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)");
+               $gconf_dep = 1;
+       }
+
        my $old_schemas_dir = "$tmp/etc/gconf/schemas";
        my $new_schemas_dir = "$tmp/usr/share/gconf/schemas";
 
@@ -50,7 +84,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        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.6.2-1)");
+                       addsubstvar($package, "misc:Depends", "gconf2 (>= 2.10.1-2)") unless $gconf_dep;
                }
        }
 }
@@ -64,5 +98,6 @@ This program is a part of debhelper.
 =head1 AUTHOR
 
 Ross Burton <ross@burtonini.com>
+Josselin Mouette <joss@debian.org>
 
 =cut