This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osrm.
commit 30ae355b2bac07b98c868047db0e6a7b07d43141 Author: Bas Couwenberg <[email protected]> Date: Fri Dec 25 19:14:21 2015 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/use-libosmium-package.patch | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec7fe8b..086d91d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ osrm (4.9.0+ds-1) UNRELEASED; urgency=medium * New upstream release. * Add license & copyright for fast-cpp-csv-parser to copyright file. + * Refresh patches. -- Bas Couwenberg <[email protected]> Fri, 25 Dec 2015 18:44:15 +0100 diff --git a/debian/patches/use-libosmium-package.patch b/debian/patches/use-libosmium-package.patch index f0dc9a2..b66620f 100644 --- a/debian/patches/use-libosmium-package.patch +++ b/debian/patches/use-libosmium-package.patch @@ -4,13 +4,13 @@ Forwarded: not-needed --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -33,7 +33,8 @@ option(BUILD_TOOLS "Build OSRM tools" OF - +@@ -37,7 +37,8 @@ include_directories(${CMAKE_CURRENT_SOUR + include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/) --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) + include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) +-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) +# Use libosmium2-dev instead of embedded copy -+#include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) ++#include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) - add_custom_target(FingerPrintConfigure ALL - ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR} + add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} + "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

