debian/rules (override_dh_install): Correctly support building only

architecture-dependent packages.  (Partially addresses #629656.)

diff --git a/debian/changelog b/debian/changelog
index 26e9d42bbf34a3bb68e5b1725684a2ad25816e5d..786e33c96ae26d5a701e445148780bd9e841f1c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ ncbi-blast+ (2.2.25-2) UNRELEASED; urgency=low
 
   * 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@debian.org>  Wed, 08 Jun 2011 20:10:46 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 08 Jun 2011 20:20:13 -0400
 
 ncbi-blast+ (2.2.25-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index c7183c25ef7874ccf767224f88a7c69e0469cd12..4596e17b6024ada06af9ee181ffa4bd3f1cea314 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ override_dh_auto_test:
        -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 @@ override_dh_install:
            $(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