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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit ce91bfb56c3d84f089c1b6c7e101c6839c3d772d
Author: Stephen Gran <steve at lobefin.net>
Date:   Sun Jun 14 11:16:22 2009 +0100

    Move make check into build target so it is not run under fakeroot, and
    reenable make check
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/rules b/debian/rules
index b463d32..9bb6f84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ else
   ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
     with_check := disabled because cross-compiling.
   else
-    with_check := borken
+    with_check := yes
   endif
 endif
 
@@ -88,6 +88,20 @@ endif
 	perl -pe 's~#COMMON-FUNCTIONS#~qx{cat debian/common_functions}~eg' < debian/clamav-freshclam.config.in > debian/clamav-freshclam.config
 	perl -pe 's~#COMMON-FUNCTIONS#~qx{cat debian/common_functions}~eg' < debian/clamav-freshclam.postinst.in > debian/clamav-freshclam.postinst
 	touch build-arch-stamp
+ifeq ($(with_check),yes)
+ifneq (,$(filter alpha, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
+	@echo "Ignoring errors because of #521737"
+	-$(MAKE) check
+else
+ifneq (,$(filter ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
+	$(MAKE) check EF_ALIGNMENT=8
+else
+	$(MAKE) check
+endif
+endif
+else
+	@echo "Testsuite not run: $(with_check)."
+endif
 
 clean:
 	debconf-updatepo
@@ -111,23 +125,6 @@ endif
 	rm -f debian/clamav-freshclam.postinst
 	dh_clean
 
-check:
-	dh_testdir
-ifeq ($(with_check),yes)
-ifneq (,$(filter alpha, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
-	@echo "Ignoring errors because of #521737"
-	-$(MAKE) check
-else
-ifneq (,$(filter ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
-	$(MAKE) check EF_ALIGNMENT=8
-else
-	$(MAKE) check
-endif
-endif
-else
-	@echo "Testsuite not run: $(with_check)."
-endif
-
 install: install-indep install-arch
 install-indep: install-indep-stamp
 install-indep-stamp: build-indep-stamp
@@ -184,7 +181,7 @@ clamav-testfiles: install-indep
 	dh_fixperms -p$@
 	dh_builddeb -p$@
 
-install-arch: install-arch-stamp check
+install-arch: install-arch-stamp
 install-arch-stamp: build-stamp
 	dh_testdir
 	dh_testroot
@@ -345,4 +342,4 @@ binary-indep: build install clamav-base clamav-testfiles clamav-docs
 binary-arch: build install libclamav6 clamav clamav-daemon clamav-freshclam clamav-milter libclamav-dev clamav-dbg
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install check
+.PHONY: build clean binary-indep binary-arch binary install

-- 
Debian repository for ClamAV