remove dev, update rpath issues

diff --git a/debian/changelog b/debian/changelog
index ba6fc10951f1539732967925adff41264348ff06..7cc2fbd3dc78334deb1329cbc1b191d1aaef68a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 ncbi-blast-plus (2.2.25-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release (Closes: #624394) 
 
- -- Olivier Sallou <osallou@irisa.fr>  Wed, 27 Apr 2011 15:19:59 +0200
+ -- Olivier Sallou <olivier.sallou@irisa.fr>  Wed, 27 Apr 2011 15:19:59 +0200

diff --git a/debian/control b/debian/control
index 1498aa6cd562b7f5a111e58a5d5757ec0559365e..3848a8836a698c9dd4d51090df6c6be862123d28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ncbi-blast-plus
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~),libboost-all-dev,zlib1g-dev,bzip2,python,libpcre++-dev,zlib1g-dev
+Build-Depends: debhelper (>= 7.0.50~),autotools-dev,libboost-all-dev,zlib1g-dev,bzip2,python,libpcre++-dev,zlib1g-dev,chrpath
 Standards-Version: 3.9.1
 Uploaders: Olivier Sallou <olivier.sallou@irisa.fr>
 DM-Upload-Allowed: yes
@@ -20,14 +20,11 @@ Description: NCBI Blast+ is new blast evolution
   used sequence similarity tool. There are versions of BLAST that 
  compare protein queries to protein databases, nucleotide queries 
  to nucleotide databases, as well as versions that translate nucleotide 
- queries or databases in all six frames and compare to protein databases or queries.
+ queries or databases in all six frames and compare to protein databases 
+ or queries.
  PSI-BLAST produces a position-specific-scoring-matrix (PSSM) starting 
  with a protein query, and then uses that PSSM to perform further searches.
- It is also possible to compare a protein or nucleotide query to a database of PSSM’s.
- The NCBI supports a BLAST web page at blast.ncbi.nlm.nih.gov as well as a network service.
-
-Package: ncbi-blast-plus-dev
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Libraries and includes for development
- Contains static libraries files and ncbi-tools++ includes.
+ It is also possible to compare a protein or nucleotide query to a 
+ database of PSSM’s.
+ The NCBI supports a BLAST web page at blast.ncbi.nlm.nih.gov as well as
+  a network service.

diff --git a/debian/ncbi-blast-plus-dev.docs b/debian/ncbi-blast-plus-dev.docs
deleted file mode 100644 (file)
index 19923d6..0000000
--- a/debian/ncbi-blast-plus-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-include/util/bitset/license.txt

diff --git a/debian/rules b/debian/rules
index 34faab95f9ce5834c22e1f842d790ef64150b58c..af6af44c1b8c907bd907ae71c96c06f9e0f1b699 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_CONFIGURE_EXTRA_FLAGS= --with-dll --without-debug --with-mt  --without-gbench --without-internal  --libdir=${CURDIR}/debian/ncbi-blast-plus/usr/lib/ncbi-blast-plus  --bindir=${CURDIR}/debian/ncbi-blast-plus/usr/bin --includedir=${CURDIR}/debian/ncbi-blast-plus/usr/include  --without-dbapi --without-serial --without-objects --without-ncbi-crypt --without-3psw
+export DEB_CONFIGURE_EXTRA_FLAGS= --with-dll --without-debug --with-mt  --without-gbench --without-internal  --libdir=${CURDIR}/debian/ncbi-blast-plus/usr/lib/ncbi-blast-plus  --bindir=${CURDIR}/debian/ncbi-blast-plus/usr/bin --includedir=${CURDIR}/debian/ncbi-blast-plus/usr/include  --without-3psw  --without-dbapi
 
 override_dh_auto_configure:
        ${CURDIR}/configure ${DEB_CONFIGURE_EXTRA_FLAGS} --prefix=${CURDIR}/debian/ncbi-blast-plus
@@ -18,10 +18,12 @@ override_dh_auto_configure:
 override_dh_install:
        dh_install
        rm -f ${CURDIR}/debian/ncbi-blast-plus/usr/bin/*test*
-       mkdir -p ${CURDIR}/debian/ncbi-blast-plus-dev/usr/lib/ncbi-blast-plus
+       #mkdir -p ${CURDIR}/debian/ncbi-blast-plus-dev/usr/lib/ncbi-blast-plus
+       rm -f ${CURDIR}/debian/ncbi-blast-plus/usr/lib/ncbi-blast-plus/*.a
        #mv ${CURDIR}/debian/ncbi-blast-plus/usr/lib/ncbi-blast-plus/*.a ${CURDIR}/debian/ncbi-blast-plus-dev/usr/lib/ncbi-blast-plus/
-       mv ${CURDIR}/debian/ncbi-blast-plus/usr/include ${CURDIR}/debian/ncbi-blast-plus-dev/usr/
-       
+       #mv ${CURDIR}/debian/ncbi-blast-plus/usr/include ${CURDIR}/debian/ncbi-blast-plus-dev/usr/
+       rm -rf ${CURDIR}/debian/ncbi-blast-plus/usr/include
+       find ${CURDIR}/debian/ncbi-blast-plus/usr/bin/ -type f -not -name "*.p*" | xargs chrpath -d
 
 override_dh_clean:
        dh_clean