[med-svn] r6880 - in trunk/packages/ncbi-blast-plus/trunk/debian: . legacy

[Aaron M. Ucko]

Author: ucko
Date: 2011-05-29 14:54:56 +0000 (Sun, 29 May 2011)
New Revision: 6880

Modified:
   trunk/packages/ncbi-blast-plus/trunk/debian/legacy/legacy.sh
   trunk/packages/ncbi-blast-plus/trunk/debian/rules
Log:
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.


Modified: trunk/packages/ncbi-blast-plus/trunk/debian/legacy/legacy.sh
===================================================================
--- trunk/packages/ncbi-blast-plus/trunk/debian/legacy/legacy.sh	2011-05-29 14:53:58 UTC (rev 6879)
+++ trunk/packages/ncbi-blast-plus/trunk/debian/legacy/legacy.sh	2011-05-29 14:54:56 UTC (rev 6880)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Execute legacy blast 
-legacy_blast.pl ${0##*/} $@
+exec legacy_blast ${0##*/} $@

Modified: trunk/packages/ncbi-blast-plus/trunk/debian/rules
===================================================================
--- trunk/packages/ncbi-blast-plus/trunk/debian/rules	2011-05-29 14:53:58 UTC (rev 6879)
+++ trunk/packages/ncbi-blast-plus/trunk/debian/rules	2011-05-29 14:54:56 UTC (rev 6880)
@@ -37,19 +37,21 @@
 	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
 	find . -name ncbiconf_unix.h | xargs rm -f