remote some rpath references, change compil options

diff --git a/debian/control b/debian/control
index 3848a8836a698c9dd4d51090df6c6be862123d28..1876193c06df52d4ebfa11956ab37b4a7e1a5458 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~),autotools-dev,libboost-all-dev,zlib1g-dev,bzip2,python,libpcre++-dev,zlib1g-dev,chrpath
+Build-Depends: debhelper (>= 7.0.50~),autotools-dev,zlib1g,bzip2,python,libpcre++-dev,pcre3,zlib1g-dev,chrpath
 Standards-Version: 3.9.1
 Uploaders: Olivier Sallou <olivier.sallou@irisa.fr>
 DM-Upload-Allowed: yes
@@ -13,7 +13,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ncbi-blast-plu
 
 Package: ncbi-blast-plus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},libboost-all-dev,ncbi-data,python,bzip2,libpcre++0, zlib1g
+Depends: ${shlibs:Depends}, ${misc:Depends},ncbi-data,python,bzip2,pcre3,libpcre++0, zlib1g
 Conflicts: blast2
 Description: NCBI Blast+ is new blast evolution
  The Basic Local Alignment Search Tool (BLAST) is the most widely

diff --git a/debian/rules b/debian/rules
index af6af44c1b8c907bd907ae71c96c06f9e0f1b699..e83b24692c490db8e84ad87b9075411695c0123a 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-3psw  --without-dbapi
+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  --with-3psw=std:netopt  --without-dbapi
 
 override_dh_auto_configure:
        ${CURDIR}/configure ${DEB_CONFIGURE_EXTRA_FLAGS} --prefix=${CURDIR}/debian/ncbi-blast-plus
@@ -24,6 +24,7 @@ override_dh_install:
        #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
+       find ${CURDIR}/debian/ncbi-blast-plus/usr/lib/ncbi-blast-plus/*.so | xargs chrpath -d
 
 override_dh_clean:
        dh_clean