r1786: releasing version 4.9.9

diff --git a/autoscripts/postinst-gconf b/autoscripts/postinst-gconf
index a0674bfd31f56ba525c13c9843100ff96c7cbf3e..f5e7b2bccb8003cb9a43a930fa7dff74f6004f9c 100644 (file)
--- 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 cd7554133ae71639b589e1d9fd9cc24f832a3f21..18e911bafd86717058f7ef6bb4a6ff6a65074bbb 100644 (file)
--- 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 8e147436e4b6ea5f5d8e40aa40667e95b4bc6620..b3dccc73b81cc3296f501f2a305592ec9f03b838 100644 (file)
--- 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 6c6aa6d92e1e302cfa1b4324d6aa0c4983ec4a7d..bd743428348aba3ccddef9ed05b478da5fdad731 100755 (executable)
--- 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)");
                }
        }
 }