r1695: * dh_gconf: gconf schemas moved to /usr/share/gconf/schemas. Relocate

    schemas from /etc/gconf/schemas. (Josselin Mouette)
  * dh_gconf: kill gconfd-2 so that the newly installed schemas
    are available straight away. (Josselin Mouette)
  * dh_gconf: fix bashism in restart of gconfd-2
  * dh_gconf: fix innaccuracy in man page; gconfd-2 is HUPPed, not
    killed.
  * dh_scrollkeeper: stop adding scrollkeeper to misc:Depends, since
    the postinst will not run it if it's not installed, and a single run after
    it's installed is sufficient to find all documents. Closes: #256745
  * dh_fixperms: make .ali files mode 444 to prevent recompilation by GNAT.
    For speed, only scan for .ali files in usr/lib/ada. Closes: #245211
  * dh_python: check to make sure compileall.py is available before running it
    in the postinst. Closes: #253112
  * dh_installmodules: install debian/package.modprobe into etc/modprobe.d/
    for module-init-tools. These files can sometimes need to differ from the
    etc/modutils/ files. Closes: #204336, #234495
  * dh_installmanpages is now deprecated.
  * Add a test case for bug #244157, and fixed the inverted ok() parameters
    in the others, and added a few new tests.
  * dh_link: applied GOTO Masanori's patch to fix conversion of existing
    relative symlinks between top level directories. Closes: #244157

1 files changed, 18 insertions, 4 deletions

diff --git a/dh_gconf b/dh_gconf
index a7e0e419..769dfa75 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -21,22 +21,36 @@ GConf schemas.
 It automatically generates the postinst and prerm fragments needed
 to register and unregister the schemas in etc/gconf/schemas.
 These fragements will use gconftool-2, so the package should depend on
-gconf2. This rogram will add an apprioriate dependency to ${misc:Depends}.
+gconf2. This program will add an appropriate dependency to ${misc:Depends}.
+
+The postinst script will also signal gconfd-2 so that the newly installed
+schemas are available straight away.
 
 =cut
 
 init();
 
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
+	my $old_schemas_dir = "$tmp/etc/gconf/schemas";
+	my $new_schemas_dir = "$tmp/usr/share/gconf/schemas";
+
+	# Migrate schemas from /etc/gconf/schemas to /usr/share/gconf/schemas
+	if (-d $old_schemas_dir) {
+		doit("mkdir -p $new_schemas_dir") unless -d $new_schemas_dir;
+		doit("mv $old_schemas_dir/*.schemas $new_schemas_dir/");
+		doit("rmdir --ignore-fail-on-non-empty $old_schemas_dir");
+	}
 
-	if (-d "$tmp/etc/gconf/schemas") {
+	if (-d "$new_schemas_dir") {
 		# Get a list of the schemas
-		my $schemas = `find debian/$package/etc/gconf/schemas -type f -name \*.schemas -printf '%P '`;
+		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.4.0)");
+			autoscript($package,"postrm","postrm-gconf","s%#SCHEMAS#%$schemas%");
+			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.6.2-1)");
 		}
 	}
 }