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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit d2eceff2317cd9a9aebeeda71247eaab1011917c
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Mar 16 13:09:05 2009 +0100

    Added lintian override for zlib error
    
    - Use dh_lintian to install the override file
    - Requires debhelper >= 6.0.7
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index b3a5285..f917405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ clamav (0.95rc1+dfsg-1) experimental; urgency=low
   * Run make check unless nocheck is in DEB_BUILD_OPTIONS; for now the result
     must be ignored because of upstream's #1468 that must be fixed first.
   * Changed Section of clamav-dbg to debug.
+  * Override lintian error stating that libclamav6 statically links to zlib
+    (lintian is right, libclamav6 does indeed duplicate parts of the zlib
+    code, but there is not way around that).
 
  -- Michael Tautschnig <mt at debian.org>  Mon, 16 Mar 2009 07:59:11 +0100
 
diff --git a/debian/control b/debian/control
index 0720ae1..c201ed7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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>, Michael Tautschnig <mt at debian.org>
-Build-Depends: debhelper (>=5.0), po-debconf, zlib1g-dev, libbz2-dev, libmilter-dev, libwrap0-dev, perl, bc, check, libtommath-dev, libltdl3-dev, electric-fence
+Build-Depends: debhelper (>= 6.0.7), po-debconf, zlib1g-dev, libbz2-dev, libmilter-dev, libwrap0-dev, perl, bc, check, libtommath-dev, libltdl3-dev, electric-fence
 Standards-Version: 3.8.1
 
 Package: clamav-base
diff --git a/debian/libclamav6.lintian-overrides b/debian/libclamav6.lintian-overrides
new file mode 100644
index 0000000..b86ca95
--- /dev/null
+++ b/debian/libclamav6.lintian-overrides
@@ -0,0 +1 @@
+libclamav6 binary: embedded-zlib ./usr/lib/libclamav.so.6.0.0
diff --git a/debian/rules b/debian/rules
index ba1a7fa..e24596f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -181,6 +181,8 @@ clamav-dbg:
 	dh_testroot
 	dh_installdocs -p$@
 	dh_installchangelogs -p$@ ChangeLog
+	dh_lintian -p$@
+	dh_installchangelogs -p$@ ChangeLog
 	dh_compress -p$@
 	dh_md5sums -p$@
 	dh_shlibdeps -l debian/libclamav6/usr/lib -p$@

-- 
Debian repository for ClamAV