[med-svn] [Git][med-team/hmmer][master] move hmmc2 out of /usr/bin/

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / hmmer


Commits:
27ce1de6 by Michael R. Crusoe at 2019-09-30T13:49:48Z
move hmmc2 out of /usr/bin/

- - - - -


6 changed files:

- + debian/clean
- debian/hmmer.install
- debian/patches/series
- + debian/patches/skip_threads_check
- debian/rules
- debian/tests/run-unit-test


Changes:

=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+debian/test_log


=====================================
debian/hmmer.install
=====================================
@@ -1,3 +1,2 @@
 usr/bin
 usr/share/man
-src/hmmc2 /usr/bin/


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ use_debian_packaged_libdivsufsort.patch
 verbose-easel
 hardening
 spelling
+skip_threads_check


=====================================
debian/patches/skip_threads_check
=====================================
@@ -0,0 +1,19 @@
+--- hmmer.orig/testsuite/i19-hmmpgmd-ga.pl
++++ hmmer/testsuite/i19-hmmpgmd-ga.pl
+@@ -53,11 +53,11 @@
+ # if not found, threads are not enabled and this
+ # test would fail, but we return ok status 0 because
+ # we don't want the full testsuite to fail.
+-$have_threads = `cat $builddir/src/p7_config.h | grep "^#define HMMER_THREADS"`;
+-if($have_threads eq "") { 
+-    printf("HMMER_THREADS not defined in p7_config.h\n"); 
+-    exit 0;
+-}
++#$have_threads = `cat $builddir/src/p7_config.h | grep "^#define HMMER_THREADS"`;
++#if($have_threads eq "") { 
++#    printf("HMMER_THREADS not defined in p7_config.h\n"); 
++#    exit 0;
++#}
+ 
+ 
+ # Verify that the wport and cport are CLOSED - we don't want to


=====================================
debian/rules
=====================================
@@ -37,7 +37,8 @@ override_dh_auto_configure:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	export V=VERBOSE ; make check -j$(shell nproc)
+	export V=VERBOSE ; make check -j$(shell nproc) | tee debian/test_log
+	if tail -n 6 debian/test_log | head -n 1 | grep -q FAILED ; then false ; fi
 endif
 
 override_dh_auto_build:
@@ -54,6 +55,11 @@ override_dh_auto_clean:
 override_dh_compress:
 	dh_compress -Xtutorial/
 
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p $(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/${DEB_HOST_MULTIARCH}/hmmer/
+	cp src/hmmc2 $(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/${DEB_HOST_MULTIARCH}/hmmer/
+
 override_dh_installexamples:
 	dh_installexamples
 	mkdir -p $(sampledir)/src/impl


=====================================
debian/tests/run-unit-test
=====================================
@@ -21,6 +21,7 @@ $AUTOPKGTEST_TMP/easel/devkit/sqc -v 2 ./easel/testsuite/testsuite.sqc ./easel .
 
 echo hmmer testsuite
 find /usr/bin -name "*hmm*" -exec ln -s \{\} src \;
+find /usr/lib/*/hmmer -type f -exec ln -s \{\} src \;
 ./testsuite/../easel/devkit/sqc -v 2 ./testsuite/testsuite.sqc . ./testsuite/.. \
     | tee $AUTOPKGTEST_TMP/hmmer.log
 echo $top_builddir



View it on GitLab: https://salsa.debian.org/med-team/hmmer/commit/27ce1de6ced1e5d9a97919729b0b74759494c47d

-- 
View it on GitLab: https://salsa.debian.org/med-team/hmmer/commit/27ce1de6ced1e5d9a97919729b0b74759494c47d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190930/c353fa83/attachment-0001.html>