[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-457-ge752e66

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 3afaad37585d6a6a5f0da0170e51c308eb79ddd1
Merge: 37eccf92854157cbb1960f1a51c959d1c66b37e3 8b9b574b30551aaf8e3bfe73b3016fcfc3a737f7
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Mar 24 20:11:48 2009 +0100

    Merge commit 'clamav-svn/tags/clamav-0.95' into debian/unstable
    
    Conflicts:
    	libclamunrar/unrar.c
    	libclamunrar/unrar.h
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --combined configure
index 73ffdcf,1fc1802..7bb8fa6
--- a/configure
+++ b/configure
@@@ -2989,7 -2989,7 +2989,7 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
  
 -VERSION="devel-`date +%Y%m%d`"
 +VERSION="0.95rc2"
  
  cat >>confdefs.h <<_ACEOF
  #define VERSION "$VERSION"
@@@ -2997,7 -2997,7 +2997,7 @@@ _ACEO
  
  
  LC_CURRENT=6
- LC_REVISION=1
+ LC_REVISION=2
  LC_AGE=0
  LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
  
diff --combined configure.in
index 1ed1180,8c6bebf..aa5c91c
--- a/configure.in
+++ b/configure.in
@@@ -39,11 -39,12 +39,11 @@@ dnl the date in the versio
  AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
  
  dnl change this on a release
 -VERSION="devel-`date +%Y%m%d`"
 -dnl VERSION="0.94rc1"
 +VERSION="0.95rc2"
  AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
  
  LC_CURRENT=6
- LC_REVISION=1
+ LC_REVISION=2
  LC_AGE=0
  LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
  AC_SUBST([LIBCLAMAV_VERSION])

-- 
Debian repository for ClamAV