[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 3b32be36b0644dbecee8c5cc4cb8525a35f87d0f
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:24 2008 +0100

    Revert "Clean up old incomaptible database formats.  Users of 3rd party software that also loads those old databases are now out of luck. (closes: #481864)"
    
    This reverts commit 41b628c6be8a575300472c7279f9cadc52f2c79a.

diff --git a/debian/changelog b/debian/changelog
index 9f055a1..3939b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,8 @@ clamav (0.93~dfsg-2) unstable; urgency=low
   * Wrap evaluations of [ $variable = true ] in calls to to_lower()
   * Add is_true function to catch the 7 bajillion variants of something being
     true (closes: #483874)
-  * Clean up old incomaptible database formats.  Users of 3rd party software
-    that also loads those old databases are now out of luck. (closes: #481864)
 
- -- Stephen Gran <sgran at debian.org>  Sun, 01 Jun 2008 16:20:31 +0100
+ -- Stephen Gran <sgran at debian.org>  Sat, 31 May 2008 22:28:57 +0100
 
 clamav (0.93~dfsg-1) unstable; urgency=low
 
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 2639767..a9f1044 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -50,9 +50,6 @@ case "$1" in
     if [ -e '/etc/clamav/clamd.conf' ]; then # Upgrade - clamd.conf already there
       clamconf='/etc/clamav/clamd.conf'
     fi
-    if dpkg --compare-versions $2 lt 0.93~; then
-      rm -r /var/lib/clamav/main.cvd /var/lib/clamav/main.inc /var/lib/clamav/daily.cvd /var/lib/clamav/daily.inc
-    fi
   fi
   
   if [ -f /etc/aliases ] || [ -L /etc/aliases ]; then
@@ -319,7 +316,7 @@ EOF
 
   # Update database now
   for db in main daily; do
-    if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && [ ! -e "$DATABASEDIR"/"$db".cld ]; then
+    if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ]; then
       install -m 0755 -o $user /usr/share/doc/clamav-base/examples/"$db".cvd \
         "$DATABASEDIR"
     fi

-- 
Debian repository for ClamAV