[osrm] 10/14: Add patch to fix 'occurred' typo.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osrm.

commit 61cb15f20114ba389349c457ba8964781d7fdced
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 25 22:18:38 2015 +0100

    Add patch to fix 'occurred' typo.
---
 debian/changelog                   |  1 +
 debian/patches/occurred-typo.patch | 63 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 65 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0d0032d..d12f310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ osrm (4.9.0+ds-1) UNRELEASED; urgency=medium
   * Use renamed CMake option (WITH_TOOLS -> BUILD_TOOLS).
   * Add osrm-dev package with development files.
   * Override dh_install to use --list-missing.
+  * Add patch to fix 'occurred' typo.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 25 Dec 2015 18:44:15 +0100
 
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
new file mode 100644
index 0000000..da95fd1
--- /dev/null
+++ b/debian/patches/occurred-typo.patch
@@ -0,0 +1,63 @@
+Description: Fix 'occured' typo, replace with 'occurred'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/Project-OSRM/osrm-backend/pull/1839
+
+--- 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 53a4196..ee21c43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-libosmium-package.patch
+occurred-typo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git