[pgrouting] 04/07: Drop exception-typo.patch, fixed upstream. Refresh remaining patch.
Bas Couwenberg
sebastic at debian.org
Mon Sep 26 16:50:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pgrouting.
commit 893c1e10acdb90d8c9bad2e479cfdbfc0ef7f9bb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Sep 26 17:31:38 2016 +0200
Drop exception-typo.patch, fixed upstream. Refresh remaining patch.
---
debian/changelog | 1 +
debian/patches/exception-typo.patch | 202 ---------------------
.../privacy-breach-uses-embedded-file.patch | 2 +-
debian/patches/series | 1 -
4 files changed, 2 insertions(+), 204 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a340480..9c0f6bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pgrouting (2.3.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Drop exception-typo.patch, fixed upstream. Refresh remaining patch.
-- Bas Couwenberg <sebastic at debian.org> Mon, 26 Sep 2016 17:27:45 +0200
diff --git a/debian/patches/exception-typo.patch b/debian/patches/exception-typo.patch
deleted file mode 100644
index f66823b..0000000
--- a/debian/patches/exception-typo.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-Description: Fix 'expection' typo, replace with 'exception'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/pgRouting/pgrouting/pull/681
-
---- a/src/allpairs/src/floydWarshall_driver.cpp
-+++ b/src/allpairs/src/floydWarshall_driver.cpp
-@@ -88,7 +88,7 @@ do_pgr_floydWarshall(
- #endif
- return;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- *postgres_rows = NULL;
- *result_tuple_count = 0;
---- a/src/allpairs/src/johnson_driver.cpp
-+++ b/src/allpairs/src/johnson_driver.cpp
-@@ -95,7 +95,7 @@ do_pgr_johnson(
- *err_msg = strdup(log.str().c_str());
- #endif
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- }
- }
---- a/src/alpha_shape/src/alpha_drivedist.cpp
-+++ b/src/alpha_shape/src/alpha_drivedist.cpp
-@@ -294,7 +294,7 @@ int alpha_shape(vertex_t *vertices, size
-
- return EXIT_SUCCESS;
- } catch ( ... ) {
-- *err_msg = strdup("Caught unknown expection!");
-+ *err_msg = strdup("Caught unknown exception!");
- }
- return -1;
-
---- a/src/dijkstra/src/dijkstraVia_driver.cpp
-+++ b/src/dijkstra/src/dijkstraVia_driver.cpp
-@@ -232,7 +232,7 @@ do_pgr_dijkstraViaVertex(
- *err_msg = strdup(log.str().c_str());
- #endif
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- }
- }
---- a/src/dijkstra/src/many_to_many_dijkstra_driver.cpp
-+++ b/src/dijkstra/src/many_to_many_dijkstra_driver.cpp
-@@ -119,7 +119,7 @@ do_pgr_many_to_many_dijkstra(
-
- return;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- return;
- }
---- a/src/dijkstra/src/many_to_one_dijkstra_driver.cpp
-+++ b/src/dijkstra/src/many_to_one_dijkstra_driver.cpp
-@@ -114,7 +114,7 @@ do_pgr_many_to_one_dijkstra(
-
- return;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- return;
- }
---- a/src/dijkstra/src/one_to_many_dijkstra_driver.cpp
-+++ b/src/dijkstra/src/one_to_many_dijkstra_driver.cpp
-@@ -106,8 +106,8 @@ do_pgr_one_to_many_dijkstra(
-
- return;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-- *err_msg = strdup("Caught unknown expection!\n");
-+ log << "Caught unknown exception!\n";
-+ *err_msg = strdup("Caught unknown exception!\n");
- return;
- }
- }
---- a/src/dijkstra/src/one_to_one_dijkstra_driver.cpp
-+++ b/src/dijkstra/src/one_to_one_dijkstra_driver.cpp
-@@ -108,7 +108,7 @@ do_pgr_one_to_one_dijkstra(
-
- return;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- return;
- }
---- a/src/driving_distance/src/boost_interface_drivedist.cpp
-+++ b/src/driving_distance/src/boost_interface_drivedist.cpp
-@@ -90,7 +90,7 @@ do_pgr_driving_many_to_dist(
- return;
-
- } catch ( ... ) {
-- *err_msg = strdup("Caught unknown expection!");
-+ *err_msg = strdup("Caught unknown exception!");
- *ret_path = noResult(path_count, (*ret_path));
- return;
- }
---- a/src/driving_distance/src/withPoints_dd_driver.cpp
-+++ b/src/driving_distance/src/withPoints_dd_driver.cpp
-@@ -178,7 +178,7 @@ do_pgr_many_withPointsDD(
- return 0;
-
- } catch ( ... ) {
-- *err_msg = strdup("Caught unknown expection!");
-+ *err_msg = strdup("Caught unknown exception!");
- return 1000;
- }
-
-@@ -316,7 +316,7 @@ do_pgr_withPointsDD(
- #endif
- return 0;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- }
- return 1000;
---- a/src/ksp/src/ksp_driver.cpp
-+++ b/src/ksp/src/ksp_driver.cpp
-@@ -102,7 +102,7 @@ int do_pgr_ksp(
- #endif
- return EXIT_SUCCESS;
- } catch ( ... ) {
-- *err_msg = strdup("Caught unknown expection!");
-+ *err_msg = strdup("Caught unknown exception!");
- return -1;
- }
- }
---- a/src/ksp/src/withPoints_ksp_driver.cpp
-+++ b/src/ksp/src/withPoints_ksp_driver.cpp
-@@ -166,7 +166,7 @@ do_pgr_withPointsKsp(
- #endif
- return 0;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- }
- return 1000;
---- a/src/withPoints/src/many_to_many_withPoints_driver.cpp
-+++ b/src/withPoints/src/many_to_many_withPoints_driver.cpp
-@@ -201,7 +201,7 @@ do_pgr_many_to_many_withPoints(
- #endif
- return 0;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- return 1000;
- }
---- a/src/withPoints/src/many_to_one_withPoints_driver.cpp
-+++ b/src/withPoints/src/many_to_one_withPoints_driver.cpp
-@@ -164,7 +164,7 @@ do_pgr_many_to_one_withPoints(
- #endif
- return 0;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- return 1000;
- }
---- a/src/withPoints/src/one_to_many_withPoints_driver.cpp
-+++ b/src/withPoints/src/one_to_many_withPoints_driver.cpp
-@@ -189,7 +189,7 @@ do_pgr_one_to_many_withPoints(
- #endif
- return 0;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- return 1000;
- }
---- a/src/withPoints/src/one_to_one_withPoints_driver.cpp
-+++ b/src/withPoints/src/one_to_one_withPoints_driver.cpp
-@@ -169,7 +169,7 @@ do_pgr_withPoints(
- #endif
- return 0;
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- }
- return 1000;
---- a/tools/template/src/function1_driver.cpp
-+++ b/tools/template/src/function1_driver.cpp
-@@ -123,7 +123,7 @@ do_pgr_MY_FUNCTION_NAME(
- *err_msg = strdup(log.str().c_str());
- #endif
- } catch ( ... ) {
-- log << "Caught unknown expection!\n";
-+ log << "Caught unknown exception!\n";
- *err_msg = strdup(log.str().c_str());
- }
- }
diff --git a/debian/patches/privacy-breach-uses-embedded-file.patch b/debian/patches/privacy-breach-uses-embedded-file.patch
index 5b4c423..85b499c 100644
--- a/debian/patches/privacy-breach-uses-embedded-file.patch
+++ b/debian/patches/privacy-breach-uses-embedded-file.patch
@@ -10,6 +10,6 @@ Forwarded: not-needed
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-mathjax_path="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
+mathjax_path="mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
- extensions = ['sphinx.ext.todo', 'sphinx.ext.mathjax']
+ extensions = ['sphinx.ext.todo', 'sphinx.ext.mathjax', 'sphinx.ext.graphviz']
# Add any paths that contain templates here, relative to this directory.
diff --git a/debian/patches/series b/debian/patches/series
index 97f32d4..1a4adf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
privacy-breach-uses-embedded-file.patch
-exception-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git
More information about the Pkg-grass-devel
mailing list