[SCM] Eigen3 packaging. branch, master, updated. upstream/3.0.1-26-g8ab7308

Anton Gladky gladky.anton at gmail.com
Tue May 31 20:59:10 UTC 2011


The following commit has been merged in the master branch:
commit 6d2abfe910203f58e50bbd8d54e16e6c1776fd7a
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue May 31 22:49:04 2011 +0200

    Update debian/rules

diff --git a/debian/rules b/debian/rules
index 40993a9..1b76e59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 BUILDDIR = $(CURDIR)/debian/build
 
 %:
-	dh --buildsystem=cmake --builddirectory=${BUILDDIR} $@
+	dh --buildsystem=cmake --builddirectory=$(BUILDDIR) $@
 
 override_dh_installchangelogs:
 	dh_installchangelogs debian/Changelog_upstream
@@ -11,18 +11,16 @@ override_dh_auto_test:
 	echo -- Running tests. Even if one of them fails the build is not canceled.
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
-	cd ${BUILDDIR}; ./debug.sh; $(MAKE) check || true
+	cd $(BUILDDIR); $(MAKE) buildtests
+	dh_auto_test -- -VV || true
 
 binary-indep: 
-	dh --buildsystem=cmake --builddirectory=${BUILDDIR} --before dh_auto_build $@
-	cd ${BUILDDIR}; $(MAKE) doc
-	rm -f ${BUILDDIR}/doc/html/unsupported/FreeSans.ttf
-	rm -f ${BUILDDIR}/doc/html/unsupported/installdox
-	rm -f ${BUILDDIR}/doc/html/jquery.js
-	rm -f ${BUILDDIR}/doc/html/unsupported/jquery.js
-	dh --buildsystem=cmake --builddirectory=${BUILDDIR} --after dh_auto_build $@
+	dh --buildsystem=cmake --builddirectory=$(BUILDDIR) --before dh_auto_build $@
+	cd $(BUILDDIR); $(MAKE) doc
+	rm -f $(BUILDDIR)/doc/html/unsupported/installdox
+	dh --buildsystem=cmake --builddirectory=$(BUILDDIR) --after dh_auto_build $@
 
 binary-arch: 
-	dh --buildsystem=cmake --builddirectory=${BUILDDIR} $@
+	dh --buildsystem=cmake --builddirectory=$(BUILDDIR) $@
 
-binary: binary-indep binary-arch
+binary: binary-indep

-- 
Eigen3 packaging. 



More information about the debian-science-commits mailing list