Andreas Tille pushed to branch master at Debian Med / iqtree
Commits:
8c143aad by Andreas Tille at 2022-01-20T15:42:28+01:00
Drop invalid option `-omp` from build time test
- - - - -
d1c4466d by Andreas Tille at 2022-01-21T11:39:26+01:00
Deal with renamed omp version
- - - - -
3260ddf2 by Andreas Tille at 2022-01-21T12:04:58+01:00
Remove -omp option from autopkgtest
- - - - -
c24cf020 by Andreas Tille at 2022-01-21T12:30:51+01:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/install
- debian/rules
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-iqtree (2.0.7+dfsg-1) UNRELEASED; urgency=medium
+iqtree (2.0.7+dfsg-1) unstable; urgency=medium
[ Andreas Tille ]
* New upstream version
@@ -9,17 +9,13 @@ iqtree (2.0.7+dfsg-1) UNRELEASED; urgency=medium
Repository-Browse.
* Build-Depends: libboost-dev
* Executables are now named iqtree2
+ * Drop invalid option `-omp` from build time test
[ Steffen Moeller ]
* Fix watchfile to detect new versions on github (routine-update)
* Standards-Version: 4.6.0
- TODO: Wait for upstream for answer to rename from iqtree to iqtree2
- + time /build/iqtree-2.0.7+dfsg/build.omp/iqtree2-omp -s example.phy -omp 2
-redo
- Invalid "-omp" option.
- Command exited with non-zero status 2
-
- -- Andreas Tille <[email protected]> Wed, 14 Oct 2020 09:15:22 +0200
+ -- Andreas Tille <[email protected]> Fri, 21 Jan 2022 12:05:21 +0100
iqtree (1.6.12+dfsg-1) unstable; urgency=medium
=====================================
debian/install
=====================================
@@ -1 +1 @@
-build.omp/iqtree-omp usr/bin
+build.omp/iqtree2-omp usr/bin
=====================================
debian/rules
=====================================
@@ -33,7 +33,7 @@ dh_auto_build_%:
if [ -x build.omp/iqtree2 ] ; then mv build.omp/iqtree2
build.omp/iqtree2-omp ; fi
dh_auto_install_%:
- dh_auto_install -Bbuild.$(subst dh_auto_install_,,$@)
+ if [ "$(subst dh_auto_install_,,$@)" != "omp" ] ; then dh_auto_install
-Bbuild.$(subst dh_auto_install_,,$@); fi
override_dh_install:
dh_install
@@ -72,7 +72,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# fi
ifneq ($(shell nproc), 1)
sed '/ myprefix/,$$d' debian/Documents_source/example.sh > example.short
- echo 'time $(CURDIR)/build.omp/iqtree2-omp -s example.phy -omp 2
-redo' >> example.short
+ echo 'time $(CURDIR)/build.omp/iqtree2-omp -s example.phy -redo' >>
example.short
time sh example.short
rm example.short
endif
=====================================
debian/tests/run-unit-test
=====================================
@@ -43,10 +43,7 @@ time $PATHTOEXE -redo -s example.phy -m TIM+I+G -lbp 1000
time $PATHTOEXE -redo -s example.phy -m TIM+I+G -alrt 1000 -lbp 1000
time $PATHTOEXE -redo -s example.phy -m TIM+I+G -bb 1000 -alrt 1000 -lbp 1000
time $PATHTOEXE -redo -s example.phy -sp example.nex
-time $PATHTOEXEOMP -redo -s example.phy -omp 2
-if [ $(nproc) -ge 3 ] ; then
- time $PATHTOEXEOMP -redo -s example.phy -omp 3
-fi
+time $PATHTOEXEOMP -redo -s example.phy
if [ -e example.treels ] ; then
time $PATHTOEXE -redo -s example.phy -z example.treels
time $PATHTOEXE -redo -s example.phy -z example.treels -n 1
View it on GitLab:
https://salsa.debian.org/med-team/iqtree/-/compare/92ab7cbe976b8a8a83757664d5c4150dbae2113e...c24cf02087cce83aa517d1d1ce3004fa1524411e
--
View it on GitLab:
https://salsa.debian.org/med-team/iqtree/-/compare/92ab7cbe976b8a8a83757664d5c4150dbae2113e...c24cf02087cce83aa517d1d1ce3004fa1524411e
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
