From: joey <joey>
Date: Thu, 22 Sep 2005 08:00:21 +0000 (+0000)
Subject: r1786: releasing version 4.9.9
X-Git-Tag: 4.9.9^0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=29add35a30e5b0aeb2d23b3e2d4b7a05c97c535f;p=debhelper.git

r1786: releasing version 4.9.9
---

diff --git a/autoscripts/postinst-gconf b/autoscripts/postinst-gconf
index a0674bf..f5e7b2b 100644
--- a/autoscripts/postinst-gconf
+++ b/autoscripts/postinst-gconf
@@ -1,13 +1,3 @@
 if [ "$1" = "configure" ]; then
-	SCHEMA_LOCATION=/usr/share/gconf/schemas
-	SCHEMA_FILES="#SCHEMAS#"
-	for SCHEMA in $SCHEMA_FILES; do
-		if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
-			HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-				gconftool-2 \
-				--makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
-		fi
-	done
-
-	kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true
+	/usr/sbin/gconf-schemas --register #SCHEMAS#
 fi
diff --git a/autoscripts/prerm-gconf b/autoscripts/prerm-gconf
index cd75541..18e911b 100644
--- a/autoscripts/prerm-gconf
+++ b/autoscripts/prerm-gconf
@@ -1,11 +1,3 @@
 if [ "$1" = remove ] || [ "$1" = upgrade ]; then
-	SCHEMA_LOCATION=/usr/share/gconf/schemas
-	SCHEMA_FILES="#SCHEMAS#"
-	for SCHEMA in $SCHEMA_FILES; do
-		if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
-			HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-				gconftool-2 \
-					--makefile-uninstall-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
-		fi
-	done
+	/usr/sbin/gconf-schemas --unregister #SCHEMAS#
 fi
diff --git a/debian/changelog b/debian/changelog
index 8e14743..b3dccc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
-debhelper (4.9.9) UNRELEASED; urgency=low
+debhelper (4.9.9) unstable; urgency=low
 
   * dh_shlibdeps: Avoid a use strict warning in some cases if 
     LD_LIBRARY_PATH is not set. 
+  * ACK NMU. Closes: #327209
 
  -- Joey Hess <joeyh@debian.org>  Wed,  7 Sep 2005 15:32:53 -0400
 
+debhelper (4.9.8.1) unstable; urgency=low
+
+  * NMU with maintainer approval.
+  * dh_gconf: delegate schema registration the gconf-schemas script, 
+    which moves schemas to /var/lib/gconf, and require gconf2 2.10.1-2,
+    where it can be found. Closes: #327209
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 21 Sep 2005 23:39:01 +0200
+
 debhelper (4.9.8) unstable; urgency=low
 
   * Spelling patch from Kumar Appaiah. Closes: #324892
diff --git a/dh_gconf b/dh_gconf
index 6c6aa6d..bd74342 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -50,7 +50,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)");
 		}
 	}
 }