From: Aaron M. Ucko <ucko@debian.org>
Date: Sun, 29 May 2011 14:54:56 +0000 (+0000)
Subject: Rework override_dh_install; adjust debian/legacy/legacy.sh accordingly.
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~351
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f526dba032d81f89a852978acc07aa21d8af7510;p=ncbi-blast%2B.git

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 985fd0fb..dba6d0ca 100755
--- 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 a42525df..244834da 100755
--- 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