r13358 - in /desktop/unstable/gconf2/debian: changelog gconf2.postinst gconf2.postrm

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Nov  1 18:00:42 2007
New Revision: 13358

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13358
Log:
Improve scripts

Modified:
    desktop/unstable/gconf2/debian/changelog
    desktop/unstable/gconf2/debian/gconf2.postinst
    desktop/unstable/gconf2/debian/gconf2.postrm

Modified: desktop/unstable/gconf2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf2/debian/changelog?rev=13358&op=diff
==============================================================================
--- desktop/unstable/gconf2/debian/changelog (original)
+++ desktop/unstable/gconf2/debian/changelog Thu Nov  1 18:00:42 2007
@@ -6,14 +6,14 @@
   * Rename the source package to gconf, to remove the (finally unused!)
     GConf 1 stuff.
   * gconf2.postinst:
-    + Run gconf-schemas --register-all on the first installation. This 
-      allows installing packages shipping gconf schemas but not 
+    + Run gconf-schemas --register-all on the first installation. This
+      allows installing packages shipping gconf schemas but not
       depending on gconf2.
     + Also run update-gconf-defaults.
-  * gconf2.postrm: remove the directories in /var/lib/gconf to enforce a 
-    correct behavior in the postinst.
-
- -- Josselin Mouette <joss at debian.org>  Thu, 01 Nov 2007 18:34:12 +0100
+  * gconf2.postrm: remove the directory contents in /var/lib/gconf/*/ to 
+    enforce a correct behavior in the postinst.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 01 Nov 2007 18:47:26 +0100
 
 gconf2 (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/gconf2/debian/gconf2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf2/debian/gconf2.postinst?rev=13358&op=diff
==============================================================================
--- desktop/unstable/gconf2/debian/gconf2.postinst (original)
+++ desktop/unstable/gconf2/debian/gconf2.postinst Thu Nov  1 18:00:42 2007
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -e
 
 if [ "$1" != "configure" ] || dpkg --compare-versions "$2" lt 2.19.1-2; then
@@ -24,13 +23,15 @@
   fi
 done
 
-if [ "$1" = configure ] && [ -z "$2" ] || [ ! -d /var/lib/gconf/defaults ]; then
-  # First installation: rebuild the defaults database in case 
-  # of packages shipping schemas but not depending on gconf2
-  gconf-schemas --register-all
-  SIGNAL_DAEMONS=no
+if [ -d /usr/share/gconf/schemas ]; then
+  if [ "$1" = configure ] && [ -z "$2" ] || [ ! -s /var/lib/gconf/defaults/%gconf-tree.xml ]; then
+    # First installation: rebuild the defaults database in case 
+    # of packages shipping schemas but not depending on gconf2
+    gconf-schemas --register-all
+    SIGNAL_DAEMONS=no
+  fi
 fi
-if [ "$1" = configure ] && [ -z "$2" ] || [ ! -d /var/lib/gconf/debian.defaults ]; then
+if [ -d /usr/share/gconf/defaults ] && [ ! -s /var/lib/gconf/debian.defaults/%gconf-tree.xml ]; then
   # Same for the defaults
   update-gconf-defaults
   SIGNAL_DAEMONS=no

Modified: desktop/unstable/gconf2/debian/gconf2.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf2/debian/gconf2.postrm?rev=13358&op=diff
==============================================================================
--- desktop/unstable/gconf2/debian/gconf2.postrm (original)
+++ desktop/unstable/gconf2/debian/gconf2.postrm Thu Nov  1 18:00:42 2007
@@ -2,8 +2,7 @@
 set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    rm -rf /var/lib/gconf/defaults
-    rm -rf /var/lib/gconf/debian.defaults
+    find /var/lib/gconf -mindepth 2 -maxdepth 2 -exec rm -rf \{} \;
 fi
 
 #DEBHELPER#