[osm2pgrouting] 04/05: Drop spelling-errors.patch, applied upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgrouting.

commit fe729c689ae06b4a0616b61b823d6b9137eba9ed
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 15 10:33:26 2017 +0200

    Drop spelling-errors.patch, applied upstream.
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 -
 debian/patches/spelling-errors.patch | 58 ------------------------------------
 3 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f647ef..f3c33dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 osm2pgrouting (2.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop spelling-errors.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 Oct 2017 10:32:33 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 38edaa7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index b7012e2..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fix spelling errors.
- * droped      -> dropped
- * successfull -> successful
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/pgRouting/osm2pgrouting/pull/187
-Applied-Upstream: https://github.com/pgRouting/osm2pgrouting/commit/e5eeea8d001e857331aefd86d851c28004995446
-
---- a/src/database/Export2DB.cpp
-+++ b/src/database/Export2DB.cpp
-@@ -167,16 +167,16 @@ void Export2DB::dropTables() const {
-         pqxx::work Xaction(db_conn);
- 
-         Xaction.exec(ways().drop());
--        std::cout << "TABLE: " << ways().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << ways().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.exec(vertices().drop());
--        std::cout << "TABLE: " << vertices().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << vertices().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.exec(pois().drop());
--        std::cout << "TABLE: " << pois().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << pois().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.exec(configuration().drop());
--        std::cout << "TABLE: " << configuration().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << configuration().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.commit();
-     } catch (const std::exception &e) {
-@@ -188,13 +188,13 @@ void Export2DB::dropTables() const {
-         pqxx::connection db_conn(conninf);
-         pqxx::work Xaction(db_conn);
-         Xaction.exec(osm_nodes().drop());
--        std::cout << "TABLE: " << osm_nodes().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << osm_nodes().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.exec(osm_ways().drop());
--        std::cout << "TABLE: " << osm_ways().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << osm_ways().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.exec(osm_relations().drop());
--        std::cout << "TABLE: " << osm_relations().addSchema() << " droped ... OK.\n";
-+        std::cout << "TABLE: " << osm_relations().addSchema() << " dropped ... OK.\n";
- 
-         Xaction.commit();
-     } catch (const std::exception &e) {
---- a/src/osm_elements/osm2pgrouting.cpp
-+++ b/src/osm_elements/osm2pgrouting.cpp
-@@ -133,7 +133,7 @@ int main(int argc, char* argv[]) {
-                 << endl;
-             pqxx::connection C(connection_str);
-             if (C.is_open()) {
--                cout << "database connection successfull: " << C.dbname() << endl;
-+                cout << "database connection successful: " << C.dbname() << endl;
-             } else {
-                 cout << "Can't open database" << endl;
-                 return 1;

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