[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6597-g0a62223

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 0a622235b1d98db6b9328db2069772d4857a97b8
Author: Michael Tautschnig <mt at debian.org>
Date:   Sat Sep 25 22:10:14 2010 +0200

    Do rmdir of directories used by all binary packages in each of them
    
    - We cannot rely on clamav-base's postrm to be the last one being called
    - This should make piuparts happy again
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index da37dbe..31444df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ clamav (0.96.3+dfsg-2) unstable; urgency=low
   [ Michael Tautschnig ]
   * Cherry-pick from upstream: Only enable RLIMIT_DATA warning on *BSD
     (already included in Ubuntu's 1ubuntu3).
+  * Do rmdir /etc/clamav, /var/log/clamav, /var/lib/clamav in all postrms as
+    we cannot count on clamav-base's postrm to be the last one being called
+    (thanks piuparts).
   
  -- Michael Tautschnig <mt at debian.org>  Sat, 25 Sep 2010 21:31:58 +0200
 
diff --git a/debian/clamav-daemon.postrm b/debian/clamav-daemon.postrm
index 23fbde6..1ec0224 100644
--- a/debian/clamav-daemon.postrm
+++ b/debian/clamav-daemon.postrm
@@ -29,6 +29,11 @@ case "$1" in
       rm -f $LOGROTATE_FILE
     fi
   fi
+  for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+    if [ -d "$dir" ]; then
+      rmdir "$dir" --ignore-fail-on-non-empty || true
+    fi
+  done
   ;;
   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
   ;;
diff --git a/debian/clamav-freshclam.postrm b/debian/clamav-freshclam.postrm
index 14d68fc..ba3a04c 100644
--- a/debian/clamav-freshclam.postrm
+++ b/debian/clamav-freshclam.postrm
@@ -52,6 +52,11 @@ case "$1" in
   [ ! -d "${workdir}/main.inc/" ] || rmdir --ignore-fail-on-non-empty ${workdir}/main.inc/
   [ ! -d "${workdir}/daily.inc/" ] || rmdir --ignore-fail-on-non-empty ${workdir}/daily.inc/
   update-rc.d clamav-freshclam remove >/dev/null
+  for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+    if [ -d "$dir" ]; then
+      rmdir "$dir" --ignore-fail-on-non-empty || true
+    fi
+  done
   ;;
   remove)
   rm -f /var/lib/clamav/main.cvd /var/lib/clamav/main.cld
diff --git a/debian/clamav-milter.postrm b/debian/clamav-milter.postrm
index 1bc6367..90af7be 100644
--- a/debian/clamav-milter.postrm
+++ b/debian/clamav-milter.postrm
@@ -35,6 +35,11 @@ case "$1" in
     done
   fi
   rm -f /var/log/clamav/clamav-milter.log* /etc/clamav/clamav-milter.conf.dpkg-old /etc/clamav/clamav-milter.conf.ucf-old
+  for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+    if [ -d "$dir" ]; then
+      rmdir "$dir" --ignore-fail-on-non-empty || true
+    fi
+  done
   ;;
   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
   ;;

-- 
Debian repository for ClamAV