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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 3b8e7e04f6689ab13faf7d2ea94ab4800430f5da
Merge: 5afad95a9219287704ba436324d3c392fa3a68bc d7b624a9f23f9a12ae62b1b5ac9d8b27c3ba8e54
Author: Stephen Gran <steve at lobefin.net>
Date:   Sat Apr 17 17:44:31 2010 +0100

    Merge branch 'debian/unstable' of ssh://git.debian.org/git/pkg-clamav/clamav into debian/unstable
    
    Conflicts:
    	debian/changelog
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --combined debian/changelog
index 1fc4f92,62f2a92..dc8efd4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,15 -3,11 +3,16 @@@ clamav (0.96+dfsg-2) unstable; urgency=
    [ Scott Kitterman ]
    * In debian/clamav-base.postinst.in and debian/clamav-freshclam.postinst.in,
      adjust debconf processing for new options to produce valid configuration
-     files (closes: #577499)
+     files (closes: #577499, #577952)
  
    [ Stephen Gran ]
    * Note that this series (closes: #577462)
 +  * Added debconf handling of new config options (closes: #577611)
 +  * Update ScanMail template and make freshclam LogTime default to true to
 +    bring it into alignment with others (closes: #521661, #521657)
 +    Other questions were deemed outside of scope of debconf for now.
 +  * Bytecode defaults to true, as upstream recommends (closes: #57920)
+   * Added debconf handling of new config options (closes: #577611, #577920)
    
    [ Michael Tautschnig ]
    * Create and maintain logrotate file (closes: #577041)
@@@ -22,8 -18,10 +23,10 @@@
      exists (closes: #550641)
    * Increase virtual memory ulimit for unit tests to 600000 to make unit tests
      work on kfreebsd-amd64 as well
+   * Changed debconf template for freshclam/interface question to make clear
+     that multiple interfaces are ok (closes: #545969)
  
 - -- Stephen Gran <sgran at debian.org>  Sat, 17 Apr 2010 15:19:36 +0200
 + -- Stephen Gran <sgran at debian.org>  Sat, 17 Apr 2010 17:30:04 +0100
  
  clamav (0.96+dfsg-1) unstable; urgency=low
  
diff --combined debian/clamav-base.templates
index 89151bf,a173b0f..365a677
--- a/debian/clamav-base.templates
+++ b/debian/clamav-base.templates
@@@ -72,8 -72,10 +72,8 @@@ Type: boolea
  Default: true
  _Description: Do you want to enable mail scanning?
   This option enables scanning mail contents for viruses.
 - You need this option
 - enabled if you want to use clamav-milter. It is recommended that you use
 - a separate unpacker to extract any MIME parts of email messages if you want
 - to scan email.
 + You need this option enabled if you want to use clamav-milter, or if
 + you want to enable phishing checks.
  
  Template: clamav-base/ScanArchive
  Type: boolean
@@@ -181,7 -183,7 +181,7 @@@ Template: clamav-base/BytecodeSecurit
  Type: select
  __Choices: TrustSigned, Paranoid
  Default: TrustSigned
- _Description: Please choose the security level to apply to the bytecode:
+ _Description: Security level to apply to the bytecode:
   .
    - TrustSigned : trust bytecode loaded from signed virus database files,
                    but insert runtime safety checks for bytecode loaded

-- 
Debian repository for ClamAV