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

[Michael Tautschnig]

The following commit has been merged in the debian/squeeze-updates branch:
commit 36f9b7be7b453c2aa46ba600e9970b02c25090ac
Merge: 9393de501d0e18e64e9be0be14c142f81f17e08a d1947898ec082fe1f52a90edecb5c4117b861081
Author: Michael Tautschnig <mt at debian.org>
Date:   Fri Jun 10 14:08:09 2011 +0100

    Merge branch 'debian/unstable' into debian/squeeze-updates
    
    Conflicts:
    	debian/changelog
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --combined debian/changelog
index 82fdcc4,e2649ff..1604251
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,29 +1,31 @@@
- clamav (0.97+dfsg-3~squeeze1) stable; urgency=low
 -clamav (0.97.1+dfsg-1) unstable; urgency=low
++clamav (0.97.1+dfsg-1~squeeze1) stable; urgency=low
  
    [ Michael Tautschnig ]
+   * New upstream release
    * Added debconf question for clamav-milter/LogClean (closes: #617890).
    * Clarified text about clamav-milter's temporary directory in debconf
      question (closes: #617889).
    * Debconf translation updates
      - Japanese (closes: #624802)
+   * Remove references to other libraries from dependency_libs field
+     (closes: #621206). Thanks Luk Claes for the patch.
+   * Added doc-base file to clamav-docs (closes: #629357). Thanks John Vogel.
  
    [ Stephen Gran ]
    * Update README.Debian to reflect reality for the milter (closes: #597048)
  
-  -- Stephen Gran <sgran at debian.org>  Mon, 02 May 2011 00:42:58 +0100
+  -- Michael Tautschnig <mt at debian.org>  Fri, 10 Jun 2011 12:03:43 +0100
  
 -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