This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osrm.
commit 614a2a216adc923ab3c6b527ab6f90af571ceca8 Author: Bas Couwenberg <[email protected]> Date: Mon Jun 13 20:20:02 2016 +0200 Refresh patches. --- debian/changelog | 1 + debian/patches/spelling-errors.patch | 2 +- debian/patches/use-libosmium-package.patch | 7 +++---- debian/patches/use-mapbox-variant-package.patch | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index f19250b..16b15b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ osrm (5.2.1+ds-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. * Drop license & copyright for fast-cpp-csv-parser, no longer included. + * Refresh patches. -- Bas Couwenberg <[email protected]> Mon, 13 Jun 2016 19:31:13 +0200 diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch index 6ee1582..ea2a242 100644 --- a/debian/patches/spelling-errors.patch +++ b/debian/patches/spelling-errors.patch @@ -4,7 +4,7 @@ Author: Bas Couwenberg <[email protected]> --- a/include/contractor/graph_contractor.hpp +++ b/include/contractor/graph_contractor.hpp -@@ -247,7 +247,7 @@ class GraphContractor +@@ -255,7 +255,7 @@ class GraphContractor edges.shrink_to_fit(); BOOST_ASSERT(0 == edges.capacity()); diff --git a/debian/patches/use-libosmium-package.patch b/debian/patches/use-libosmium-package.patch index 165ab5f..31ed3c9 100644 --- a/debian/patches/use-libosmium-package.patch +++ b/debian/patches/use-libosmium-package.patch @@ -4,19 +4,18 @@ Forwarded: not-needed --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -226,10 +226,11 @@ if(UNIX AND NOT APPLE) +@@ -243,10 +243,10 @@ if(UNIX AND NOT APPLE) set(MAYBE_RT_LIBRARY rt) endif() -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/cmake") -set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include") -find_package(Osmium REQUIRED COMPONENTS io) --include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS}) -+# Use libosmium2-dev instead of embedded copy +-add_dependency_includes(${OSMIUM_INCLUDE_DIR}) +#list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/cmake") +#set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include") +#find_package(Osmium REQUIRED COMPONENTS io) -+#include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS}) ++#add_dependency_includes(${OSMIUM_INCLUDE_DIR}) find_package(Boost 1.49.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) diff --git a/debian/patches/use-mapbox-variant-package.patch b/debian/patches/use-mapbox-variant-package.patch index da42486..df6ad36 100644 --- a/debian/patches/use-mapbox-variant-package.patch +++ b/debian/patches/use-mapbox-variant-package.patch @@ -4,7 +4,7 @@ Forwarded: not-needed --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -40,6 +40,7 @@ option(SANITIZER OFF) +@@ -57,6 +57,7 @@ option(SANITIZER OFF) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/) include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) @@ -12,7 +12,7 @@ Forwarded: not-needed add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}" -@@ -379,7 +380,7 @@ set_property(TARGET osrm-contract PROPER +@@ -411,7 +412,7 @@ set_property(TARGET osrm-contract PROPER set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) @@ -21,7 +21,7 @@ Forwarded: not-needed file(GLOB LibraryGlob include/osrm/*.hpp) file(GLOB ParametersGlob include/engine/api/*_parameters.hpp) set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/phantom_node.hpp) -@@ -394,7 +395,7 @@ install(FILES ${ExtractorHeader} DESTINA +@@ -426,7 +427,7 @@ install(FILES ${ExtractorHeader} DESTINA install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor) install(FILES ${LibraryGlob} DESTINATION include/osrm) install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api) -- 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
