[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 2a7d2b5029255c8746a093ce7f89df7cfe9ddbe2

[Michael Meskes]

The following commit has been merged in the debian/unstable branch:
commit 2a7d2b5029255c8746a093ce7f89df7cfe9ddbe2
Merge: dcaae13db2f54713d13872c4687b6eaa6e9ed8ca 73f3a190967e454fb51fafb363ea2d78715277ea
Author: Michael Meskes <meskes at debian.org>
Date:   Sun Sep 7 18:29:17 2008 +0200

    Merge branch 'debian/unstable' of ssh://meskes@git.debian.org/git/pkg-clamav/clamav into debian/unstable
    
    Conflicts:
    
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 06393ef,2443100..e30e6a9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,14 @@@
  clamav (0.94.dfsg-2) unstable; urgency=low
  
++  [ Michael Meskes ]
 +  * Added myself as uploader.
 +  * Changed watch file to account for dfsg extension.
 +
-  -- Michael Meskes <meskes at debian.org>  Sun, 07 Sep 2008 14:45:09 +0200
+   [ Michael Tautschnig ]
+   * Use lsb's status_of_proc function to determine the status of the process
+     and return with according exit codes (closes: #486076)
+   
+  -- Stephen Gran <sgran at debian.org>  Sun, 07 Sep 2008 17:25:34 +0200
  
  clamav (0.94.dfsg-1) unstable; urgency=low
  
diff --combined debian/control
index 5af4592,6ba2be2..3a29d71
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: clama
  Section: utils
  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>
 -Uploaders: Stephen Gran <sgran at debian.org>, Michael Tautschnig <mt at debian.org>
++Uploaders: Stephen Gran <sgran at debian.org>, Michael Meskes <meskes at debian.org>, Michael Tautschnig <mt at debian.org>
  Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>=5.0), po-debconf, zlib1g-dev (>=1:1.1.4), libbz2-dev, libmilter-dev, libgmp3-dev, libwrap0-dev, perl, bc, check
  Standards-Version: 3.8.0
  
@@@ -123,7 -123,7 +123,7 @@@ Description: anti-virus utility for Uni
  
  Package: clamav-daemon
  Architecture: any
- Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), ucf
+ Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>= 3.2-13), ucf
  Suggests: daemon, clamav-docs
  Description: anti-virus utility for Unix - scanner daemon
   Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
@@@ -162,7 -162,7 +162,7 @@@ Architecture: an
  Conflicts: clamav-data, libclamav3, libclamav2
  Provides: clamav-data
  Suggests: clamav-docs
- Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>> 3.0)
+ Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>= 3.2-13)
  Description: anti-virus utility for Unix - virus database update utility
   Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
   this software is the integration with mail servers (attachment
@@@ -181,7 -181,7 +181,7 @@@ Architecture: an
  Suggests: daemon, clamav-docs
  Priority: extra
  Recommends: clamav-daemon
- Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0)
+ Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>= 3.2-13)
  Description: anti-virus utility for Unix - sendmail integration
   Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
   this software is the integration with mail servers (attachment

-- 
Debian repository for ClamAV