[med-svn] [libseqlib] 02/04: Use versioned dependency from libhts-dev which now contains cram/cram.h; use pkg-config

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libseqlib.

commit 37c0aee145125b779fb6a8235a035b583cbe4fa4
Author: Andreas Tille <tille at debian.org>
Date:   Thu Feb 9 16:33:13 2017 +0100

    Use versioned dependency from libhts-dev which now contains cram/cram.h; use pkg-config
---
 debian/control                                   | 5 +++--
 debian/patches/use_debian_packaged_jsoncpp.patch | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index cec6fc7..0581efc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10),
                d-shlibs,
-               libhts-dev,
+               pkg-config,
+               libhts-dev (>= 1.3.2-3),
                libcurl4-openssl-dev | libcurl4-dev,
                zlib1g-dev,
                libfml-dev (>= 0.1-3),
                libbwa-dev (>= 0.7.15-3),
-               htslib-test,
                libjsoncpp-dev,
                libssw-dev
 Standards-Version: 3.9.8
@@ -42,6 +42,7 @@ Section: libdevel
 Depends: libseqlib0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends},
+         libhts-dev (>= 1.3.2-3),
          libjsoncpp-dev,
          libbwa-dev
 Description: C++ htslib/bwa-mem/fermi interface for interrogating sequence data (dev)
diff --git a/debian/patches/use_debian_packaged_jsoncpp.patch b/debian/patches/use_debian_packaged_jsoncpp.patch
index 8b90aa2..9433063 100644
--- a/debian/patches/use_debian_packaged_jsoncpp.patch
+++ b/debian/patches/use_debian_packaged_jsoncpp.patch
@@ -7,8 +7,8 @@ Description: Do not use code copy of jsoncpp
 @@ -1,8 +1,8 @@
  lib_LTLIBRARIES  = libseqlib.la
  
--libseqlib_la_CPPFLAGS = -I../ -I../htslib -I/usr/include/fml -Wno-sign-compare
-+libseqlib_la_CPPFLAGS = -I../ -I../htslib -I/usr/include/fml -I/usr/include/jsoncpp/ -Wno-sign-compare
+-libseqlib_la_CPPFLAGS = `pkg-config --cflags htslib` -I/usr/include/fml -Wno-sign-compare
++libseqlib_la_CPPFLAGS = `pkg-config --cflags htslib` -I/usr/include/fml `pkg-config --cflags jsoncpp` -Wno-sign-compare
  
 -libseqlib_la_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp jsoncpp.cpp ssw_cpp.cpp ssw.c \
 +libseqlib_la_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp ssw_cpp.cpp ssw.c \

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