Rework override_dh_install; adjust debian/legacy/legacy.sh accordingly.

* Don't bother with ${CURDIR}, which just adds noise.
* Leave extensions off /usr/bin scripts per Policy 10.4.
  (Update legacy.sh accordingly, and have it exec legacy_blast for efficiency.)
* Clean up tests, demos, and internal build tools, but don't worry about
  anything that we now arrange not to install in the first place.

diff --git a/debian/legacy/legacy.sh b/debian/legacy/legacy.sh
index 985fd0fb5b3d55a2609872a7944fa7a676e1db85..dba6d0cadd9c09a0acc6572aa4676e88c947b50d 100755 (executable)
--- a/debian/legacy/legacy.sh
+++ b/debian/legacy/legacy.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Execute legacy blast 
-legacy_blast.pl ${0##*/} $@
+exec legacy_blast ${0##*/} $@

diff --git a/debian/rules b/debian/rules
index a42525dfa4e20fdc7a9beed9cf101eb7234861ab..244834da73dfdede56836e957d500d65a4779a8a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,18 +37,20 @@ override_dh_auto_install:
        cp c++/BUILD/bin/*    $(instroot)/bin/
 
 override_dh_install:
-       #TODO - can I just use -X.a -Xinclude instead of removing unneeded files later?
-       dh_install
-       cp debian/legacy/legacy.sh debian/ncbi-blast+-legacy/usr/share/ncbi-blast+/bin
-       rm -f ${CURDIR}/debian/ncbi-blast+/usr/bin/*test*
-       #mkdir -p ${CURDIR}/debian/ncbi-blast+-dev/usr/lib/ncbi-blast+
-       rm -f ${CURDIR}/debian/ncbi-blast+/usr/lib/ncbi-blast+/*.a
-       #mv ${CURDIR}/debian/ncbi-blast+/usr/lib/ncbi-blast+/*.a ${CURDIR}/debian/ncbi-blast+-dev/usr/lib/ncbi-blast+/
-       #mv ${CURDIR}/debian/ncbi-blast+/usr/include ${CURDIR}/debian/ncbi-blast+-dev/usr/
-       rm -rf ${CURDIR}/debian/ncbi-blast+/usr/include
-       find ${CURDIR}/debian/ncbi-blast+/usr/bin/ -type f -not -name "*.p*" | xargs chrpath -d
-       find ${CURDIR}/debian/ncbi-blast+/usr/lib/ncbi-blast+/*.so | xargs chrpath -d
-       mv ${CURDIR}/debian/ncbi-blast+/usr/bin/rpsblast ${CURDIR}/debian/ncbi-blast+/usr/bin/rpsblast+
+       # dh_install
+       mv $(instroot)/bin/rpsblast $(instroot)/bin/rpsblast+
+       mv $(instroot)/bin/legacy_blast.pl   $(instroot)/bin/legacy_blast
+       mv $(instroot)/bin/update_blastdb.pl $(instroot)/bin/update_blastdb
+       mv $(instroot)/bin/windowmasker_2.2.22_adapter.py \
+          $(instroot)/bin/windowmasker_2.2.22_adapter
+# Clean up tests, demos, and internal build tools
+       rm -f $(instroot)/bin/*test* $(instroot)/bin/seqdb_demo \
+           $(instroot)/bin/gene_info_reader $(instroot)/bin/datatool \
+           $(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/
 
 override_dh_clean:
        dh_clean