[med-svn] r18855 - in trunk/packages/spades/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-02-24 17:31:15 +0000 (Tue, 24 Feb 2015)
New Revision: 18855

Modified:
   trunk/packages/spades/trunk/debian/control
   trunk/packages/spades/trunk/debian/patches/do_not_install_third_party_libs.patch
Log:
Enable pbuilder builds


Modified: trunk/packages/spades/trunk/debian/control
===================================================================
--- trunk/packages/spades/trunk/debian/control	2015-02-24 16:10:32 UTC (rev 18854)
+++ trunk/packages/spades/trunk/debian/control	2015-02-24 17:31:15 UTC (rev 18855)
@@ -10,6 +10,7 @@
                libbz2-dev,
                libboost-dev,
                libbamtools-dev,
+               libhts-dev,
                lynx
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/spades/trunk/

Modified: trunk/packages/spades/trunk/debian/patches/do_not_install_third_party_libs.patch
===================================================================
--- trunk/packages/spades/trunk/debian/patches/do_not_install_third_party_libs.patch	2015-02-24 16:10:32 UTC (rev 18854)
+++ trunk/packages/spades/trunk/debian/patches/do_not_install_third_party_libs.patch	2015-02-24 17:31:15 UTC (rev 18855)
@@ -30,25 +30,24 @@
  include_directories(${SPADES_MAIN_INCLUDE_DIR} ${SPADES_BUILT_INCLUDE_DIR})
 --- a/src/cmake/deps.cmake
 +++ b/src/cmake/deps.cmake
-@@ -16,6 +16,21 @@ endif()
+@@ -16,6 +16,20 @@ endif()
  find_package(OpenMP)
  find_package(ZLIB REQUIRED)
  find_package(BZip2 REQUIRED)
 +
-+# BamTools
-+## SET(BAMTOOLS_DIR "/usr")
-+FIND_LIBRARY(BAMTOOLS_LIB bamtools ${BAMTOOLS_DIR}/lib)
-+## Hmmm, this seems to be quite brutal and should be rather set by FIND_LIBRARY
++# BamTools: The bamtools package would require a cmake control file.
++#           Than we could use:
++# FIND_LIBRARY(BAMTOOLS_LIB bamtools ${BAMTOOLS_DIR}/lib)
++# MESSAGE(status "** BAMTOOLS Include: ${INCLUDE_DIRECTORIES}")
++# MESSAGE(status "** BAMTOOLS Link: ${LINK_DIRECTORIES}")
++# MESSAGE(status "** BAMTOOLS Lib: ${BAMTOOLS_DIR}")
++#
++# find_package(BamTools REQUIRED)
++## Hmmm, this seems to be quite brutal and should be rather set by FIND_LIBRARY see above
 +ADD_DEFINITIONS(-I/usr/include/bamtools)
 +ADD_DEFINITIONS(-L/usr/lib)
 +ADD_DEFINITIONS(-lbamtools)
 +
-+MESSAGE(status "** BAMTOOLS Include: ${INCLUDE_DIRECTORIES}")
-+MESSAGE(status "** BAMTOOLS Link: ${LINK_DIRECTORIES}")
-+MESSAGE(status "** BAMTOOLS Lib: ${BAMTOOLS_DIR}")
-+
-+
-+find_package(BamTools REQUIRED)
  find_package(Readline QUIET)
  set(CURSES_NEED_NCURSES TRUE)
  find_package(Curses QUIET)