[med-svn] [nanocall] 01/06: Use Debian packages libhpptools-dev

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository nanocall.

commit a8385d1e51c2ea63653a5279fe73b27d62735b1e
Author: Andreas Tille <tille at debian.org>
Date:   Wed Sep 14 10:39:20 2016 +0200

    Use Debian packages libhpptools-dev
---
 debian/control                                |  1 +
 debian/patches/series                         |  1 +
 debian/patches/use_debian_packaged_libs.patch | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/control b/debian/control
index 7bcd632..795f92e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9),
                libfast5-dev,
                libtclap-dev,
                libhdf5-serial-dev,
+               libhpptools-dev,
                zlib1g-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/nanocall.git
diff --git a/debian/patches/series b/debian/patches/series
index 5b1926d..3356b06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_broken_makefile.patch
+use_debian_packaged_libs.patch
diff --git a/debian/patches/use_debian_packaged_libs.patch b/debian/patches/use_debian_packaged_libs.patch
new file mode 100644
index 0000000..1e7266e
--- /dev/null
+++ b/debian/patches/use_debian_packaged_libs.patch
@@ -0,0 +1,23 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 13 Sep 2016 14:28:24 +0200
+Description: Use Debian packaged libraries
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -46,7 +46,7 @@ set(SUBDIRS
+     nanocall version
+     CACHE INTERNAL "Subdirectories to descend into")
+ set(HEADER_SUBDIRS
+-    builtin_models fast5/src hpptools/include tclap/include
++    builtin_models 
+     nanocall version
+     CACHE INTERNAL "Subdirectories containing header files")
+ 
+@@ -136,6 +136,7 @@ include_directories(SYSTEM
+ include_directories(
+     ${PROJECT_BINARY_DIR}
+     ${HEADER_SUBDIRS}
++    /usr/include/hpptools
+     )
+ get_directory_property(include_directories INCLUDE_DIRECTORIES)
+ message(STATUS "INCLUDE_DIRECTORIES='${include_directories}'")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/nanocall.git