* Remove old /etc/openafs/server-local files from older versions when

  purging openafs-fileserver.
* Minor reformatting of openafs-client's postrm.

diff --git a/debian/changelog b/debian/changelog
index 6441166b946342c34bd7a75196a61374ff947737..1dbbc43e177330b712e18e6fbc6cbd9f8aff1e52 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-openafs (1.4.6.dfsg1-2) unstable; urgency=low
+openafs (1.4.6.dfsg1-2) UNRELEASED; urgency=low
 
   * Apply additional upstream patches to the 2.6.24 support to fix
     builds with older kernels.  Thanks to Felix Koop for the testing.
     (Closes: #458331)
+  * Remove old /etc/openafs/server-local files from older versions when
+    purging openafs-fileserver.
+  * Minor reformatting of openafs-client's postrm.
 
  -- Russ Allbery <rra@debian.org>  Sun, 30 Dec 2007 14:42:56 -0800
 

diff --git a/debian/openafs-client.postrm b/debian/openafs-client.postrm
index 08fa0b5645caa8bd75c43bc662aeb84d416febe6..789c1eda2ff4ade69a1ee98eff898ead6ec4346c 100644 (file)
--- a/debian/openafs-client.postrm
+++ b/debian/openafs-client.postrm
@@ -1,43 +1,21 @@
 #! /bin/sh
-# postrm script for openafs
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
-
 case "$1" in
 purge)
     rmdir /afs 2>/dev/null || true
-    rm /etc/openafs/cacheinfo 2>/dev/null ||true
-    rm /etc/openafs/CellServDB 2>/dev/null ||true
-    rm /etc/openafs/ThisCell 2>/dev/null ||true
-    rm /etc/openafs/afs.conf.client 2>/dev/null || true
+    for file in cacheinfo CellServDB ThisCell afs.conf.client ; do
+        rm -f "/etc/openafs/$file"
+    done
     ;;
-       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
 
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 0
+remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
 
+*)
+    echo "postrm called with unknown argument $1" >&2
+    exit 0
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
-
-

diff --git a/debian/openafs-fileserver.postinst b/debian/openafs-fileserver.postinst
index cd1be200bda1345856ce4c080db49a4c54418cf9..85319150e9a9c82de8485397d441d4b19a6a6bb2 100644 (file)
--- a/debian/openafs-fileserver.postinst
+++ b/debian/openafs-fileserver.postinst
@@ -1,14 +1,4 @@
-#!/bin/sh -e
-#
-# Summary of how this script can be called:
-#
-#  * <postinst> `configure' <most-recently-configured-version>
-#  * <old-postinst> `abort-upgrade' <new version>
-#  * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#    <new-version>
-#  * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#    <failed-install-package> <version> `removing'
-#    <conflicting-package> <version>
+#!/bin/sh
 
 set -e
 

diff --git a/debian/openafs-fileserver.postrm b/debian/openafs-fileserver.postrm
index ff59a1f2da1596595a4a11e3a636f3643dfdd45a..ccffda20d76a074f159a9faea5a5583ab1156a50 100644 (file)
--- a/debian/openafs-fileserver.postrm
+++ b/debian/openafs-fileserver.postrm
@@ -21,6 +21,14 @@ purge)
         rm -f "/var/lib/openafs/local/$file"
     done
     rm -f /etc/openafs/BosConfig
+
+    # Clean up after files left behind from older versions of the package.
+    if [ -d /etc/openafs/server-local ] ; then
+        for file in SALVAGE.fs fssync.sock salvage.lock sysid sysid.old ; do
+            rm -f "/etc/openafs/server-local/$file"
+        done
+        rmdir --ignore-fail-on-non-empty /etc/openafs/server-local
+    fi
     ;;
 
 remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -32,5 +40,3 @@ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 esac
 
 #DEBHELPER#
-
-