[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/squeeze-updates, updated. debian/0.95+dfsg-1-6647-gb93aca9

[Stephen Gran]

The following commit has been merged in the debian/squeeze-updates branch:
commit b93aca9845c4aeee3ca1fa8eadc019ad388a1065
Merge: b23e371bd764ebc1a639471ab49df4033b837cee d315c4deb03e9dda86843a06c3d2b45e2288af45
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Mar 17 08:07:51 2011 +0000

    Merge branch 'debian/unstable' into debian/squeeze-updates
    
    Conflicts:
    	debian/changelog
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --combined debian/changelog
index 6121a80,37146cc..802029b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,20 +1,22 @@@
 -clamav (0.97+dfsg-3) unstable; urgency=low
++clamav (0.97+dfsg-3~squeeze1) unstable; urgency=low
+ 
+   [ Michael Tautschnig ]
+   * Added debconf question for clamav-milter/LogClean (closes: #617890).
+   * Clarified text about clamav-milter's temporary directory in debconf
+     question (closes: #617889).
+ 
+  -- Michael Tautschnig <mt at debian.org>  Tue, 15 Mar 2011 13:47:00 +0000
+ 
 -clamav (0.97+dfsg-2) unstable; urgency=low
 +clamav (0.97+dfsg-2~squeeze1) stable; urgency=medium
  
    [ Michael Tautschnig ]
    * Proper suite name.
    * More tidy up: new upstream release also fixed problems with
      ExtendedDetectionInfo (upstream bb#2409, closes: #617262).
 +  * Upload intended for squeeze-updates (fixes security issues, urgency bumped
 +    to medium).
  
 - -- Michael Tautschnig <mt at debian.org>  Thu, 10 Mar 2011 22:50:28 +0000
 + -- Michael Tautschnig <mt at debian.org>  Tue, 15 Mar 2011 08:20:44 +0000
  
  clamav (0.97+dfsg-1) UNRELEASED; urgency=low
  

-- 
Debian repository for ClamAV