Author: tille
Date: 2014-08-15 13:06:05 +0000 (Fri, 15 Aug 2014)
New Revision: 17744
Added:
trunk/packages/raxml/trunk/debian/bin/raxmlHPC
Removed:
trunk/packages/raxml/trunk/debian/bin/raxml
Modified:
trunk/packages/raxml/trunk/debian/changelog
trunk/packages/raxml/trunk/debian/install
trunk/packages/raxml/trunk/debian/rules
Log:
New upstream version. do not build the "plain" raxmlHPC any more but rather
use one of the enhanced options
Deleted: trunk/packages/raxml/trunk/debian/bin/raxml
===================================================================
--- trunk/packages/raxml/trunk/debian/bin/raxml 2014-08-15 11:45:03 UTC (rev
17743)
+++ trunk/packages/raxml/trunk/debian/bin/raxml 2014-08-15 13:06:05 UTC (rev
17744)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if grep -q avx /proc/cpuinfo; then
- echo "Use raxml with AVX support"
- /usr/bin/raxmlHPC-PTHREADS-AVX "$@"
-elif grep -q sse3 /proc/cpuinfo; then
- echo "Use raxml with SSE3 support"
- /usr/bin/raxmlHPC-PTHREADS-SSE3 "$@"
-else
- echo "Use raxml with PTHREADS support"
- /usr/bin/raxmlHPC-PTHREADS "$@"
-fi
Added: trunk/packages/raxml/trunk/debian/bin/raxmlHPC
===================================================================
--- trunk/packages/raxml/trunk/debian/bin/raxmlHPC
(rev 0)
+++ trunk/packages/raxml/trunk/debian/bin/raxmlHPC 2014-08-15 13:06:05 UTC
(rev 17744)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+RAXMLDIR=`dirname $0`
+if grep -q avx /proc/cpuinfo; then
+ echo "Use raxml with AVX support"
+ ${RAXMLDIR}/raxmlHPC-PTHREADS-AVX "$@"
+elif grep -q sse3 /proc/cpuinfo; then
+ echo "Use raxml with SSE3 support"
+ ${RAXMLDIR}/raxmlHPC-PTHREADS-SSE3 "$@"
+else
+ echo "Use raxml with PTHREADS support"
+ ${RAXMLDIR}/raxmlHPC-PTHREADS "$@"
+fi
Property changes on: trunk/packages/raxml/trunk/debian/bin/raxmlHPC
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/packages/raxml/trunk/debian/changelog
===================================================================
--- trunk/packages/raxml/trunk/debian/changelog 2014-08-15 11:45:03 UTC (rev
17743)
+++ trunk/packages/raxml/trunk/debian/changelog 2014-08-15 13:06:05 UTC (rev
17744)
@@ -1,9 +1,10 @@
-raxml (8.0.26-2) UNRELEASED; urgency=medium
+raxml (8.1.1-1) unstable; urgency=medium
+ * New upstream version
* enable SIMD and threading support
Closes: #756392, #729537
- -- Andreas Tille <[email protected]> Tue, 29 Jul 2014 15:11:35 +0200
+ -- Andreas Tille <[email protected]> Fri, 15 Aug 2014 14:40:09 +0200
raxml (8.0.26-1) unstable; urgency=medium
Modified: trunk/packages/raxml/trunk/debian/install
===================================================================
--- trunk/packages/raxml/trunk/debian/install 2014-08-15 11:45:03 UTC (rev
17743)
+++ trunk/packages/raxml/trunk/debian/install 2014-08-15 13:06:05 UTC (rev
17744)
@@ -1 +1,2 @@
debian/tmpbuild/* usr/bin
+debian/bin/* usr/bin
Modified: trunk/packages/raxml/trunk/debian/rules
===================================================================
--- trunk/packages/raxml/trunk/debian/rules 2014-08-15 11:45:03 UTC (rev
17743)
+++ trunk/packages/raxml/trunk/debian/rules 2014-08-15 13:06:05 UTC (rev
17744)
@@ -6,8 +6,8 @@
DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
exe=raxmlHPC
-MFILES:=Makefile.gcc \
- Makefile.PTHREADS.gcc \
+##MFILES:=Makefile.gcc \ # we use a wrapper to the faster versions instead of
shipping the "plain" version
+MFILES:=Makefile.PTHREADS.gcc \
Makefile.SSE3.PTHREADS.gcc \
Makefile.AVX.PTHREADS.gcc
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
