This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osrm.
commit 41c171321b2d7883f24b225f2bb2c8e80e63371e Author: Bas Couwenberg <[email protected]> Date: Fri Apr 29 23:32:01 2016 +0200 * Drop typo patches, applied upstream. Refresh remaining patches. --- debian/changelog | 1 + debian/patches/disable-osrm-components.patch | 33 -------------- debian/patches/edges-typo.patch | 16 ------- debian/patches/occurred-typo.patch | 64 ---------------------------- debian/patches/series | 3 -- debian/patches/spelling-errors.patch | 16 +++---- debian/patches/use-libosmium-package.patch | 22 ++++++---- debian/rules | 2 +- 8 files changed, 24 insertions(+), 133 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04515f0..05d8003 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ osrm (5.0.2+ds-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. + * Drop typo patches, applied upstream. Refresh remaining patches. -- Bas Couwenberg <[email protected]> Fri, 29 Apr 2016 23:13:45 +0200 diff --git a/debian/patches/disable-osrm-components.patch b/debian/patches/disable-osrm-components.patch deleted file mode 100644 index 852fc4a..0000000 --- a/debian/patches/disable-osrm-components.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Don't build osrm-components with GDAL 2.x, FTFBS. -Author: Bas Couwenberg <[email protected]> -Bug: https://github.com/Project-OSRM/osrm-backend/issues/1738 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -345,16 +345,16 @@ endif() - - if(BUILD_TOOLS) - message(STATUS "Activating OSRM internal tools") -- find_package(GDAL) -- if(GDAL_FOUND) -- add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>) -- target_link_libraries(osrm-components ${TBB_LIBRARIES}) -- include_directories(SYSTEM ${GDAL_INCLUDE_DIR}) -- target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES}) -- install(TARGETS osrm-components DESTINATION bin) -- else() -- message(FATAL_ERROR "libgdal and/or development headers not found") -- endif() -+# find_package(GDAL) -+# if(GDAL_FOUND AND NOT GDAL2) -+# add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>) -+# target_link_libraries(osrm-components ${TBB_LIBRARIES}) -+# include_directories(SYSTEM ${GDAL_INCLUDE_DIR}) -+# target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES}) -+# install(TARGETS osrm-components DESTINATION bin) -+# else() -+# message(FATAL_ERROR "libgdal and/or development headers not found") -+# endif() - add_executable(osrm-cli tools/simpleclient.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:COORDINATE>) - target_link_libraries(osrm-cli ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM) - target_link_libraries(osrm-cli ${TBB_LIBRARIES}) diff --git a/debian/patches/edges-typo.patch b/debian/patches/edges-typo.patch deleted file mode 100644 index ad109e9..0000000 --- a/debian/patches/edges-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix 'egdes' typo, replace with 'edges'. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/Project-OSRM/osrm-backend/pull/1954 -Applied-Upstream: https://github.com/Project-OSRM/osrm-backend/commit/46993b43fe546f386fd4a588d5c5ef6fbc579c27 - ---- a/extractor/extractor.cpp -+++ b/extractor/extractor.cpp -@@ -618,7 +618,7 @@ void extractor::WriteEdgeBasedGraph(std: - const FingerPrint fingerprint = FingerPrint::GetValid(); - file_out_stream.write((char *)&fingerprint, sizeof(FingerPrint)); - -- std::cout << "[extractor] Writing edge-based-graph egdes ... " << std::flush; -+ std::cout << "[extractor] Writing edge-based-graph edges ... " << std::flush; - TIMER_START(write_edges); - - size_t number_of_used_edges = edge_based_edge_list.size(); diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch deleted file mode 100644 index e487140..0000000 --- a/debian/patches/occurred-typo.patch +++ /dev/null @@ -1,64 +0,0 @@ -Description: Fix 'occured' typo, replace with 'occurred'. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/Project-OSRM/osrm-backend/pull/1839 -Applied-Upstream: https://github.com/Project-OSRM/osrm-backend/commit/758d4023050d1f49971f919cea872a2276dafe14 - ---- a/extractor/extractor.cpp -+++ b/extractor/extractor.cpp -@@ -342,14 +342,14 @@ void extractor::SetupScriptingEnvironmen - if (0 != luaL_dofile(lua_state, config.profile_path.string().c_str())) - { - std::stringstream msg; -- msg << lua_tostring(lua_state, -1) << " occured in scripting block"; -+ msg << lua_tostring(lua_state, -1) << " occurred in scripting block"; - throw osrm::exception(msg.str()); - } - - if (0 != luaL_dostring(lua_state, "return traffic_signal_penalty\n")) - { - std::stringstream msg; -- msg << lua_tostring(lua_state, -1) << " occured in scripting block"; -+ msg << lua_tostring(lua_state, -1) << " occurred in scripting block"; - throw osrm::exception(msg.str()); - } - speed_profile.traffic_signal_penalty = 10 * lua_tointeger(lua_state, -1); -@@ -359,7 +359,7 @@ void extractor::SetupScriptingEnvironmen - if (0 != luaL_dostring(lua_state, "return u_turn_penalty\n")) - { - std::stringstream msg; -- msg << lua_tostring(lua_state, -1) << " occured in scripting block"; -+ msg << lua_tostring(lua_state, -1) << " occurred in scripting block"; - throw osrm::exception(msg.str()); - } - ---- a/extractor/restriction_parser.cpp -+++ b/extractor/restriction_parser.cpp -@@ -51,7 +51,7 @@ namespace - int lua_error_callback(lua_State *lua_state) - { - std::string error_msg = lua_tostring(lua_state, -1); -- throw osrm::exception("ERROR occured in profile script:\n" + error_msg); -+ throw osrm::exception("ERROR occurred in profile script:\n" + error_msg); - } - } - ---- a/extractor/scripting_environment.cpp -+++ b/extractor/scripting_environment.cpp -@@ -59,7 +59,7 @@ int lua_error_callback(lua_State *L) // - std::string error_msg = lua_tostring(L, -1); - std::ostringstream error_stream; - error_stream << error_msg; -- throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str()); -+ throw osrm::exception("ERROR occurred in profile script:\n" + error_stream.str()); - } - } - -@@ -154,7 +154,7 @@ void ScriptingEnvironment::init_lua_stat - luabind::object error_msg(luabind::from_stack(lua_state, -1)); - std::ostringstream error_stream; - error_stream << error_msg; -- throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str()); -+ throw osrm::exception("ERROR occurred in profile script:\n" + error_stream.str()); - } - } - diff --git a/debian/patches/series b/debian/patches/series index a384dd5..5545da4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ use-libosmium-package.patch -occurred-typo.patch -edges-typo.patch -disable-osrm-components.patch spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch index e9b36f9..6ee1582 100644 --- a/debian/patches/spelling-errors.patch +++ b/debian/patches/spelling-errors.patch @@ -2,14 +2,14 @@ Description: Fix spelling errors. initalization -> initialization Author: Bas Couwenberg <[email protected]> ---- a/contractor/contractor.hpp -+++ b/contractor/contractor.hpp -@@ -290,7 +290,7 @@ class Contractor - // << "); via: " << contractor_graph->GetEdgeData(i).via; - // } +--- a/include/contractor/graph_contractor.hpp ++++ b/include/contractor/graph_contractor.hpp +@@ -247,7 +247,7 @@ class GraphContractor + edges.shrink_to_fit(); -- std::cout << "contractor finished initalization" << std::endl; -+ std::cout << "contractor finished initialization" << std::endl; + BOOST_ASSERT(0 == edges.capacity()); +- util::SimpleLogger().Write() << "contractor finished initalization"; ++ util::SimpleLogger().Write() << "contractor finished initialization"; } - ~Contractor() {} + void Run(double core_factor = 1.0) diff --git a/debian/patches/use-libosmium-package.patch b/debian/patches/use-libosmium-package.patch index b66620f..a31793c 100644 --- a/debian/patches/use-libosmium-package.patch +++ b/debian/patches/use-libosmium-package.patch @@ -4,13 +4,19 @@ Forwarded: not-needed --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -37,7 +37,8 @@ include_directories(${CMAKE_CURRENT_SOUR - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/) - include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) --include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) +@@ -225,10 +225,11 @@ 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 -+#include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) ++#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_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} - "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}" + find_package(Boost 1.49.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) diff --git a/debian/rules b/debian/rules index 42c62d1..69142e0 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ override_dh_clean: $(RM) -r html/ latex/ override_dh_auto_configure: - dh_auto_configure -- -DBUILD_TOOLS=1 -DCMAKE_VERBOSE_MAKEFILE=1 + dh_auto_configure -- -DBUILD_COMPONENTS=0 -DBUILD_TOOLS=1 -DCMAKE_VERBOSE_MAKEFILE=1 override_dh_auto_build-arch: dh_auto_build --arch -- 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
