X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_gconf;h=021a592a04e1c4a7f2fc0cad8e457f6f709e279f;hb=8a57ccd69b3f3ff7d3e407c2babc33d9a08d642e;hp=514aae7972ba2d32db07214412a59b13cad586fe;hpb=a243946176b92b5fafd84f43d5a455551cf27210;p=debhelper.git

diff --git a/dh_gconf b/dh_gconf
index 514aae7..021a592 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_gconf - generate GConf schema registration scripts
+dh_gconf - install GConf defaults files and register schemas
 
 =cut
 
@@ -15,12 +15,8 @@ B<dh_gconf> [S<I<debhelper options>>] [B<--priority=<number>>]
 
 =head1 DESCRIPTION
 
-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, using
-gconf-schemas.
+dh_gconf is a debhelper program that is responsible for installing GConf
+defaults files and registering GConf schemas.
 
 An appropriate dependency on gconf2 will be generated in ${misc:Depends}.
 
@@ -31,14 +27,12 @@ An appropriate dependency on gconf2 will be generated in ${misc:Depends}.
 =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.
+directory, with "I<package>" replaced by the package name.
 
 =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.
+directory, with "I<package>" replaced by the package name.
 
 =back
 
@@ -72,17 +66,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	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)");
+		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)");
 		$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","s%#OPT#%%");
-		autoscript($package,"postrm","postrm-gconf-defaults","s%#OPT#%%");
-		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)") unless $gconf_dep;
+		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)") unless $gconf_dep;
 		$gconf_dep = 1;
 	}
 
@@ -100,9 +91,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		# Get a list of the schemas
 		my $schemas = `find $new_schemas_dir -type f -name \\*.schemas -printf '%P '`;
 		if ($schemas ne '') {
-			autoscript($package,"postinst","postinst-gconf","s%#SCHEMAS#%$schemas%");
-			autoscript($package,"prerm","prerm-gconf","s%#SCHEMAS#%$schemas%");
-			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.10.1-2)") unless $gconf_dep;
+			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)") unless $gconf_dep;
 		}
 	}
 }