[med-svn] r6952 - trunk/packages/ncbi-blast+/trunk/debian

[Aaron M. Ucko]

Author: ucko
Date: 2011-06-09 00:20:18 +0000 (Thu, 09 Jun 2011)
New Revision: 6952

Modified:
   trunk/packages/ncbi-blast+/trunk/debian/changelog
   trunk/packages/ncbi-blast+/trunk/debian/rules
Log:
debian/rules (override_dh_install): Correctly support building only
architecture-dependent packages.  (Partially addresses #629656.)


Modified: trunk/packages/ncbi-blast+/trunk/debian/changelog
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-06-09 00:11:00 UTC (rev 6951)
+++ trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-06-09 00:20:18 UTC (rev 6952)
@@ -2,8 +2,11 @@
 
   * Team upload.
   * NOT RELEASED YET
+  * Fix several sources of build failures (per #629656):
+    - debian/rules (override_dh_install): Correctly support building only
+      architecture-dependent packages.
 
- -- Aaron M. Ucko <ucko at debian.org>  Wed, 08 Jun 2011 20:10:46 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Wed, 08 Jun 2011 20:20:13 -0400
 
 ncbi-blast+ (2.2.25-1) unstable; urgency=low
 

Modified: trunk/packages/ncbi-blast+/trunk/debian/rules
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/rules	2011-06-09 00:11:00 UTC (rev 6951)
+++ trunk/packages/ncbi-blast+/trunk/debian/rules	2011-06-09 00:20:18 UTC (rev 6952)
@@ -31,6 +31,7 @@
 	-cat c++/BUILD/build/check.sh.out_err
 
 instroot = debian/ncbi-blast+/usr
+leg_bin = debian/ncbi-blast+-legacy/usr/share/ncbi-blast+/bin
 override_dh_auto_install:
 	cp c++/BUILD/lib/*.so $(instroot)/lib/ncbi-blast+/
 	cp c++/BUILD/bin/*    $(instroot)/bin/
@@ -48,8 +49,7 @@
 	    $(instroot)/bin/project_tree_builder \
 	    $(instroot)/lib/ncbi-blast+/libtest_*.so
 
-	cp debian/legacy/legacy.sh \
-	    debian/ncbi-blast+-legacy/usr/share/ncbi-blast+/bin/
+	if test -d $(leg_bin); then cp debian/legacy/legacy.sh $(leg_bin)/; fi
 
 override_dh_clean:
 	dh_clean