The following commit has been merged in the debian branch: commit a934a07337f8c9b4d018022e094454beb77e8f62 Author: Andreas Tille <ti...@debian.org> Date: Thu Nov 8 08:44:05 2012 +0100
Also remove third_party from include statements diff --git a/debian/patches/0001-ignore-thirdparty-and-fix-jsoncpp.patch b/debian/patches/0001-ignore-thirdparty-and-fix-jsoncpp.patch index bfe1298..abfbc76 100644 --- a/debian/patches/0001-ignore-thirdparty-and-fix-jsoncpp.patch +++ b/debian/patches/0001-ignore-thirdparty-and-fix-jsoncpp.patch @@ -7,8 +7,6 @@ Subject: ignore-thirdparty-and-fix-jsoncpp src/toolkit/bamtools_filter.cpp | 2 +- 2 files changed, 238 insertions(+), 2 deletions(-) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e359695..636bd62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ @@ -20,8 +18,6 @@ index e359695..636bd62 100644 add_subdirectory( toolkit ) add_subdirectory( utils ) -diff --git a/src/toolkit/bamtools_filter.cpp b/src/toolkit/bamtools_filter.cpp -index 8af9cb9..a090fea 100644 --- a/src/toolkit/bamtools_filter.cpp +++ b/src/toolkit/bamtools_filter.cpp @@ -16,7 +16,7 @@ @@ -33,3 +29,13 @@ index 8af9cb9..a090fea 100644 using namespace Json; #include <cstdio> +--- a/src/toolkit/CMakeLists.txt ++++ b/src/toolkit/CMakeLists.txt +@@ -8,7 +8,6 @@ + # set include path + include_directories( ${BamTools_SOURCE_DIR}/src/api + ${BamTools_SOURCE_DIR}/src/utils +- ${BamTools_SOURCE_DIR}/src/third_party + ) + + # compile main bamtools application -- debian packaging for bamtools _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit