[med-svn] [gatb-core] 04/04: New upstream version, do not try to get rid of json in cmake files

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gatb-core.

commit e6a9c71a718f805346f344b9aa7a0c94374d6b14
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 1 15:29:16 2017 +0100

    New upstream version, do not try to get rid of json in cmake files
---
 debian/changelog                                 |  2 +-
 debian/patches/series                            |  1 -
 debian/patches/use_debian_packaged_jsoncpp.patch | 24 ------------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40cf6bd..cc9e474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gatb-core (1.3.0+dfsg-1) UNRELEASED; urgency=medium
+gatb-core (1.4.0+dfsg-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #873044)  
 
diff --git a/debian/patches/series b/debian/patches/series
index 00a6934..8f6d780 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_debian_packaged_hdf5.patch
 fix_hdf5_includes.patch
-use_debian_packaged_jsoncpp.patch
diff --git a/debian/patches/use_debian_packaged_jsoncpp.patch b/debian/patches/use_debian_packaged_jsoncpp.patch
deleted file mode 100644
index 3b7d34b..0000000
--- a/debian/patches/use_debian_packaged_jsoncpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/gatb-core/thirdparty/CMakeLists.txt
-+++ b/gatb-core/thirdparty/CMakeLists.txt
-@@ -35,20 +35,15 @@ set (COMPILE_DEFINITIONS  "${COMPILE_DEF
- add_definitions (${COMPILE_DEFINITIONS})
- 
- # include other smaller libraries (json, Boophf)
-+FIND_PACKAGE(JSONCPP COMPONENTS C REQUIRED)
- 
- add_custom_target (thirdparty_copy ALL)
- add_custom_command (TARGET thirdparty_copy COMMAND ${CMAKE_COMMAND} -E
--    make_directory ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/json)
--add_custom_command (TARGET thirdparty_copy COMMAND ${CMAKE_COMMAND} -E
-     make_directory ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/BooPHF)
- add_custom_command (TARGET thirdparty_copy  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/thirdparty/BooPHF/BooPHF.h ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/BooPHF/)
--add_custom_command (TARGET thirdparty_copy  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/thirdparty/json/json.hpp   ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/json/)
--
- ################################################################################
- #  INSTALL 
- ################################################################################
- IF (NOT DEFINED GATB_CORE_INSTALL_EXCLUDE)
--    INSTALL (DIRECTORY ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/hdf5 DESTINATION include)
--    INSTALL (DIRECTORY ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/json DESTINATION include)
-     INSTALL (DIRECTORY ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/BooPHF DESTINATION include)
- ENDIF ()

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