[osmium] 08/16: Refresh 00-fix_typos.patch.

Bas Couwenberg sebastic at xs4all.nl
Mon Jun 9 01:03:08 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository osmium.

commit ef0065786e09cc69b5e7144cfca7d961f0ce7a35
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 8 19:20:41 2014 +0200

    Refresh 00-fix_typos.patch.
---
 debian/patches/00-fix_typos.patch | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/patches/00-fix_typos.patch b/debian/patches/00-fix_typos.patch
index 0740ae6..c02f227 100644
--- a/debian/patches/00-fix_typos.patch
+++ b/debian/patches/00-fix_typos.patch
@@ -2,19 +2,14 @@ From: David Paleino <dapal at debian.org>
 Subject: fix typo in source code
 Origin: vendor
 Forwarded: no
-
----
- include/osmium/HandlerJavascript.hpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- osmium.orig/include/osmium/HandlerJavascript.hpp
-+++ osmium/include/osmium/HandlerJavascript.hpp
-@@ -161,7 +161,7 @@ namespace Osmium {
-                     } else if (!strcmp(*type, "polygon")) {
-                         oc = new Osmium::Export::PolygonShapefile(filename);
-                     } else {
--                        throw std::runtime_error("unkown shapefile type");
-+                        throw std::runtime_error("unknown shapefile type");
-                     }
+--- a/include/osmium/javascript/wrapper/export_shapefile.hpp
++++ b/include/osmium/javascript/wrapper/export_shapefile.hpp
+@@ -51,7 +51,7 @@ namespace Osmium {
+                         } else if (!strcmp(*type, "polygon")) {
+                             oc = new Osmium::Export::PolygonShapefile(filename);
+                         } else {
+-                            throw std::runtime_error("unkown shapefile type");
++                            throw std::runtime_error("unknown shapefile type");
+                         }
  
-                     return oc->js_instance();
+                         return Osmium::Javascript::Wrapper::ExportShapefile::get<Osmium::Javascript::Wrapper::ExportShapefile>().create_instance(static_cast<void*>(oc));

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



More information about the Pkg-grass-devel mailing list