From: Russ Allbery <rra@debian.org>
Date: Sun, 30 Dec 2007 06:39:15 +0000 (+0000)
Subject: Revert the previous change.  This appears to be a dpkg bug.
X-Git-Tag: debian/1.4.6.dfsg1-2~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=540451c0d3ec7520d9c5cbfc0ae43bcffaeb0225;p=packages%2Fo%2Fopenafs.git

Revert the previous change.  This appears to be a dpkg bug.
---

diff --git a/debian/changelog b/debian/changelog
index dc089308f..5e31c573d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-openafs (1.4.6.dfsg1-2) UNRELEASED; urgency=low
-
-  * Try harder to remove /etc/openafs and /var/lib/openafs in the postrm
-    for openafs-fileserver.  (Closes: #454694)
-
- -- Russ Allbery <rra@debian.org>  Sat, 29 Dec 2007 20:33:30 -0800
-
 openafs (1.4.6.dfsg1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/openafs-fileserver.postrm b/debian/openafs-fileserver.postrm
index 0f17ae9f5..ff59a1f2d 100644
--- a/debian/openafs-fileserver.postrm
+++ b/debian/openafs-fileserver.postrm
@@ -17,12 +17,10 @@ purge)
     for file in CellServDB CellServDB.old KeyFile ThisCell UserList ; do
         rm -f "/etc/openafs/server/$file"
     done
-    rm -f /etc/openafs/BosConfig
-    rmdir --parents --ignore-fail-on-non-empty /etc/openafs/server
     for file in SALVAGE.fs fssync.sock salvage.lock sysid sysid.old ; do
         rm -f "/var/lib/openafs/local/$file"
     done
-    rmdir --parents --ignore-fail-on-non-empty /var/lib/openafs/local
+    rm -f /etc/openafs/BosConfig
     ;;
 
 remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)