[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 49c78e243c38ea638be15704f5694bf6084b30d6
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:20 2008 +0100

    Revert "Move conflicts to freshclam on older libclamavs"
    
    This reverts commit 8390315a073d436eb330eb0be8a7505f8fa7bad2.

diff --git a/debian/changelog b/debian/changelog
index c848f87..f15cf14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-clamav (0.93~dfsg-5) unstable; urgency=low
-
-  * New upstream version
-  * Move conflicts to freshclam
-
- -- Stephen Gran <sgran at debian.org>  Tue, 10 Jun 2008 20:43:32 +0100
-
 clamav (0.93~dfsg-4) unstable; urgency=low
 
   * Dammit.  The -f flag is there for a reason (closes: #484262)
diff --git a/debian/control b/debian/control
index 78a3c3a..4fe10a4 100644
--- a/debian/control
+++ b/debian/control
@@ -106,6 +106,7 @@ Description: anti-virus utility for Unix - development files
 Package: libclamav4
 Section: libs
 Architecture: any
+Conflicts: libclamav3
 Depends: ${shlibs:Depends}
 Description: anti-virus utility for Unix - library
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
@@ -159,7 +160,7 @@ Description: anti-virus utility for Unix - test files
 
 Package: clamav-freshclam
 Architecture: any
-Conflicts: clamav-data, libclamav3, libclamav2
+Conflicts: clamav-data
 Provides: clamav-data
 Suggests: clamav-docs
 Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>> 3.0)

-- 
Debian repository for ClamAV