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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit e1d130e5099abdccf9c44504f6864fc7a734a8a8
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Aug 2 17:21:11 2010 +0200

    kfreebsd-i386 build fix and minor stuff
    
    - Updated standards to 3.9.1
    - changed data seg size ulimit to 524288 to make kfreebsd-i386 happy
    - added changelog message for Stephen's recent changes
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 607db30..b4c00f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+clamav (0.96.1+dfsg-4) unstable; urgency=low
+
+  [ Michael Tautschnig ]
+  * Set data segment limit in tests to 524288 to make kfreebsd-i386 systems
+    happy (closes: #591245).
+  * Bumped Standards-Version to 3.9.1, no changes needed.
+  
+  [ Stephen Gran ]
+  * Fixed NotifyClamd config options handling.
+
+ -- Michael Tautschnig <mt at debian.org>  Mon, 02 Aug 2010 17:15:37 +0200
+
 clamav (0.96.1+dfsg-3) unstable; urgency=low
 
   [ Michael Tautschnig ]
diff --git a/debian/control b/debian/control
index da7e7f5..dfe9592 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>
 Uploaders: Stephen Gran <sgran at debian.org>, Michael Meskes <meskes at debian.org>, Michael Tautschnig <mt at debian.org>
 Build-Depends: debhelper (>= 6.0.7), po-debconf, zlib1g-dev, libbz2-dev, libmilter-dev, perl, bc, check, libtommath-dev, libltdl-dev, electric-fence, libncurses5-dev, python
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://www.clamav.net/
 
 Package: clamav-base
diff --git a/unit_tests/check_common.sh b/unit_tests/check_common.sh
index 1b3b94e..4f93b8d 100644
--- a/unit_tests/check_common.sh
+++ b/unit_tests/check_common.sh
@@ -47,7 +47,7 @@ die()
 
 # Setup test directory to avoid temporary and output file clashes
 test_start() {
-    ulimit -t 120; ulimit -d 600000;
+    ulimit -t 120; ulimit -d 524288;
     ulimit -v 600000 || true;
     (cd test-$1 2>/dev/null && killclamd || true)
     rm -rf test-$1

-- 
Debian repository for ClamAV