This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pgrouting.
commit e9dee1665a8f446b1dc56e6f486bf258ee31b7e6 Author: Bas Couwenberg <[email protected]> Date: Tue Apr 19 07:53:11 2016 +0200 Drop spelling-errors.patch, applied upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/spelling-errors.patch | 101 ----------------------------------- 3 files changed, 1 insertion(+), 102 deletions(-) diff --git a/debian/changelog b/debian/changelog index f980a97..156e7fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pgrouting (2.2.1-1) UNRELEASED; urgency=medium * New upstream release. + * Drop spelling-errors.patch, applied upstream. -- Bas Couwenberg <[email protected]> Tue, 19 Apr 2016 07:52:02 +0200 diff --git a/debian/patches/series b/debian/patches/series index 387a98a..1a4adf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ privacy-breach-uses-embedded-file.patch -spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index 7ec5c59..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,101 +0,0 @@ -Description: Fix spelling errors. - missmatch -> mismatch - requiered -> required - shoud -> should - didnt -> didn't -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/pgRouting/pgrouting/pull/539 -Applied-Upstream: https://github.com/pgRouting/pgrouting/commit/089c7bddc1527e753842e5289ad967620caa4e76 - ---- a/src/common/src/postgres_connection.c -+++ b/src/common/src/postgres_connection.c -@@ -38,7 +38,7 @@ pgr_send_error(int errcode) { - elog(ERROR, "Unexpected point(s) with same pid but different edge/fraction/side combination found."); - break; - case 2: -- elog(ERROR, "Internal: Unexpected missmatch count and sequence number on results"); -+ elog(ERROR, "Internal: Unexpected mismatch count and sequence number on results"); - break; - default: - elog(ERROR, "Unknown exception"); ---- a/doc/src/tutorial/custom_query.rst -+++ b/doc/src/tutorial/custom_query.rst -@@ -121,9 +121,9 @@ When the columns required have the defau - - .. code-block:: sql - -- pgr_func('edge_table') -- when tolerance is not requiered -- pgr_func('edge_table',0.001) -- when tolerance is requiered -- -- s_in_rule, s_out_rule, st_in_rules, t_out_rules are requiered -+ pgr_func('edge_table') -- when tolerance is not required -+ pgr_func('edge_table',0.001) -- when tolerance is required -+ -- s_in_rule, s_out_rule, st_in_rules, t_out_rules are required - SELECT pgr_analyzeOneway('edge_table', ARRAY['', 'B', 'TF'], ARRAY['', 'B', 'FT'], - ARRAY['', 'B', 'FT'], ARRAY['', 'B', 'TF']) - ---- a/src/allpairs/src/johnson_driver.cpp -+++ b/src/allpairs/src/johnson_driver.cpp -@@ -57,7 +57,7 @@ do_pgr_johnson( - std::ostringstream log; - try { - if (total_tuples == 1) { -- log << "Requiered: more than one tuple\n"; -+ log << "Required: more than one tuple\n"; - (*return_tuples) = NULL; - (*return_count) = 0; - *err_msg = strdup(log.str().c_str()); ---- a/src/dijkstra/src/dijkstraVia_driver.cpp -+++ b/src/dijkstra/src/dijkstraVia_driver.cpp -@@ -183,7 +183,7 @@ do_pgr_dijkstraViaVertex( - try { - - if (total_tuples == 1) { -- log << "Requiered: more than one tuple\n"; -+ log << "Required: more than one tuple\n"; - (*return_tuples) = NULL; - (*return_count) = 0; - *err_msg = strdup(log.str().c_str()); ---- a/tools/template/src/function1_driver.cpp -+++ b/tools/template/src/function1_driver.cpp -@@ -66,7 +66,7 @@ do_pgr_MY_FUNCTION_NAME( - try { - - if (total_tuples == 1) { -- log << "Requiered: more than one tuple\n"; -+ log << "Required: more than one tuple\n"; - (*return_tuples) = NULL; - (*return_count) = 0; - *err_msg = strdup(log.str().c_str()); ---- a/src/driving_distance/src/boost_interface_drivedist.cpp -+++ b/src/driving_distance/src/boost_interface_drivedist.cpp -@@ -140,7 +140,7 @@ do_pgr_driving_distance( - - log << "Returning number of tuples" << path.size() << "\n"; - if (path.empty()) { -- log << "NOTICE: it shoud have at least the one for it self"; -+ log << "NOTICE: it should have at least the one for it self"; - *err_msg = strdup(log.str().c_str()); - *ret_path = noResult(path_count, (*ret_path)); - return; ---- a/src/mainpage.dox -+++ b/src/mainpage.dox -@@ -56,7 +56,7 @@ Step by Step processing - ~~~~{.c} - git remote -v - ~~~~ -- - Now you shoud have something like this: -+ - Now you should have something like this: - ~~~~{.c} - origin https://github.com/acountName/pgrouting (fetch) - origin https://github.com/acountName/pgrouting (push) ---- a/src/withPoints/src/pgr_withPoints.cpp -+++ b/src/withPoints/src/pgr_withPoints.cpp -@@ -261,7 +261,7 @@ create_new_edges( - } - } - if (points_on_edge.empty()) { -- log << "For some reason we didnt find a point belonging to the edge, must be an error\n"; -+ log << "For some reason we didn't find a point belonging to the edge, must be an error\n"; - return false; - } - #if 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
