r1703: * dh_cgonf: deal with problems if /etc/gconf/schemas doesn't exist any...

     (#258901)

diff --git a/autoscripts/postrm-gconf b/autoscripts/postrm-gconf
index 10a47fd709d2dd42a27ad9c89f84ca5c21760587..c05eb43d3b574227e136573f389d12e34fd3b97f 100644 (file)
--- a/autoscripts/postrm-gconf
+++ b/autoscripts/postrm-gconf
@@ -1,7 +1,10 @@
 if [ "$1" = purge ]; then
+       OLD_DIR=/etc/gconf/schemas
        SCHEMA_FILES="#SCHEMAS#"
-       for SCHEMA in $SCHEMA_FILES; do
-               rm -f /etc/gconf/schemas/$SCHEMA
-       done
-       rmdir -p --ignore-fail-on-non-empty /etc/gconf/schemas
+       if [ -d $OLD_DIR ]; then
+               for SCHEMA in $SCHEMA_FILES; do
+                       rm -f $OLD_DIR/$SCHEMA
+               done
+               rmdir -p --ignore-fail-on-non-empty $OLD_DIR
+       fi
 fi

diff --git a/dh_gconf b/dh_gconf
index 769dfa755ac67fd414074612c5a1f3b819b4bb55..33d83947e82d353de248f6636195ac9bb5fee9f0 100755 (executable)
--- a/dh_gconf
+++ b/dh_gconf
@@ -40,7 +40,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        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");
+               doit("rmdir -p --ignore-fail-on-non-empty $old_schemas_dir");
        }
 
        if (-d "$new_schemas_dir") {