[med-svn] [libseqlib] 04/04: jsoncpp.cpp is part of jsoncpp and should not be build here

[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 4fe320c8d21b5fb057be9b372e02c3bcad7b25f2
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 3 18:00:23 2017 +0100

    jsoncpp.cpp is part of jsoncpp and should not be build here
---
 debian/patches/use_debian_packaged_jsoncpp.patch | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/patches/use_debian_packaged_jsoncpp.patch b/debian/patches/use_debian_packaged_jsoncpp.patch
index 4007395..8b90aa2 100644
--- a/debian/patches/use_debian_packaged_jsoncpp.patch
+++ b/debian/patches/use_debian_packaged_jsoncpp.patch
@@ -4,11 +4,22 @@ Description: Do not use code copy of jsoncpp
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
+@@ -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_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 jsoncpp.cpp ssw_cpp.cpp ssw.c \
++libseqlib_la_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp ssw_cpp.cpp ssw.c \
  			GenomicRegion.cpp RefGenome.cpp BamWriter.cpp BamReader.cpp \
+ 			BWAWrapper.cpp BamRecord.cpp FermiAssembler.cpp BamHeader.cpp
+ libseqlib_la_LDFLAGS = -version-info @LIB_VERSION@
+--- a/seq_test/Makefile.am
++++ b/seq_test/Makefile.am
+@@ -17,4 +17,4 @@ seq_test_SOURCES = seq_test.cpp \
+ 	../src/ReadFilter.cpp ../src/BamRecord.cpp \
+ 	../src/BWAWrapper.cpp \
+         ../src/RefGenome.cpp ../src/SeqPlot.cpp ../src/BamHeader.cpp \
+-	../src/FermiAssembler.cpp ../src/ssw_cpp.cpp ../src/ssw.c ../src/jsoncpp.cpp
++	../src/FermiAssembler.cpp ../src/ssw_cpp.cpp ../src/ssw.c

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