[med-svn] r17064 - trunk/packages/python-biopython/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-06-08 08:29:42 +0000 (Sun, 08 Jun 2014)
New Revision: 17064

Modified:
   trunk/packages/python-biopython/trunk/debian/changelog
   trunk/packages/python-biopython/trunk/debian/control
   trunk/packages/python-biopython/trunk/debian/rules
Log:
Build-Depends raxml only on those architectures where it is available


Modified: trunk/packages/python-biopython/trunk/debian/changelog
===================================================================
--- trunk/packages/python-biopython/trunk/debian/changelog	2014-06-08 08:26:13 UTC (rev 17063)
+++ trunk/packages/python-biopython/trunk/debian/changelog	2014-06-08 08:29:42 UTC (rev 17064)
@@ -1,6 +1,8 @@
 python-biopython (1.64+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * Build-Depends raxml only on those architectures where it is available
+    Closes: #750845
 
  -- Andreas Tille <tille at debian.org>  Sun, 08 Jun 2014 10:25:35 +0200
 

Modified: trunk/packages/python-biopython/trunk/debian/control
===================================================================
--- trunk/packages/python-biopython/trunk/debian/control	2014-06-08 08:26:13 UTC (rev 17063)
+++ trunk/packages/python-biopython/trunk/debian/control	2014-06-08 08:29:42 UTC (rev 17064)
@@ -39,7 +39,7 @@
                python3-renderpm,
                python-psycopg2,
                python3-psycopg2,
-               raxml,
+               raxml [any-amd64],
                t-coffee,
                wise
 # python-rdflib (>= 4)  # only in experimental

Modified: trunk/packages/python-biopython/trunk/debian/rules
===================================================================
--- trunk/packages/python-biopython/trunk/debian/rules	2014-06-08 08:26:13 UTC (rev 17063)
+++ trunk/packages/python-biopython/trunk/debian/rules	2014-06-08 08:29:42 UTC (rev 17064)
@@ -25,9 +25,9 @@
 
 # avoid amd64 only tools on other architectures
 ifeq ($(BUILDARCH),amd64)
-    EXCLUDEBWA=
+    EXCLUDEARCHamd64=
 else
-    EXCLUDEBWA=BWA_tool
+    EXCLUDEARCHamd64=BWA_tool raxml_tool
 endif
 
 # avoid tests requiring data base connections if no server is running while we are doing the build
@@ -55,7 +55,7 @@
 override_dh_auto_test:
 	mkdir -p Tests_avoid
 	if [ "$(EXCLUDERDFLIB)" != "" ] ; then echo "You might like to install python-rdflib from experimental to run Phylo_CDAO test" ; else echo "Phylo_CDAO will be done"; fi
-	for avoid in $(EXCLUDEONLINE) $(EXCLUDENONFREE) $(EXCLUDENOTPACKAGED) $(EXCLUDEBWA) $(EXCLUDEDATABASE) $(EXCLUDERDFLIB) $(EXCLUDEFAILINGTESTS) \
+	for avoid in $(EXCLUDEONLINE) $(EXCLUDENONFREE) $(EXCLUDENOTPACKAGED) $(EXCLUDEARCHamd64) $(EXCLUDEDATABASE) $(EXCLUDERDFLIB) $(EXCLUDEFAILINGTESTS) \
 		    ; do \
 	    mv Tests/test_$${avoid}.py Tests_avoid ; \
 	done