[mapnik] 02/06: Add patches for various typos.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Feb 7 00:47:03 UTC 2016


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

sebastic pushed a commit to branch master
in repository mapnik.

commit c296157595294d1f140433ecc40ebd70148b7bb5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 7 01:29:47 2016 +0100

    Add patches for various typos.
---
 debian/changelog                     |  1 +
 debian/patches/initialize-typo.patch | 25 +++++++++++++++++++++++++
 debian/patches/occurred-typo.patch   | 14 ++++++++++++++
 debian/patches/series                |  2 ++
 4 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 19bf5e8..5b4180e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapnik (3.0.9+ds-2) UNRELEASED; urgency=medium
 
   * Update Vcs-Git URL to use HTTPS.
+  * Add patches for various typos.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 05 Feb 2016 21:12:05 +0100
 
diff --git a/debian/patches/initialize-typo.patch b/debian/patches/initialize-typo.patch
new file mode 100644
index 0000000..a0df67d
--- /dev/null
+++ b/debian/patches/initialize-typo.patch
@@ -0,0 +1,25 @@
+Description: Fix 'intialize' typo, replace with 'initialize'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/map.cpp
++++ b/src/map.cpp
+@@ -695,7 +695,7 @@ featureset_ptr Map::query_point(unsigned
+ {
+     if (!current_extent_.valid())
+     {
+-        throw std::runtime_error("query_point: map extent is not intialized, you need to set a valid extent before querying");
++        throw std::runtime_error("query_point: map extent is not initialized, you need to set a valid extent before querying");
+     }
+     if (!current_extent_.intersects(x,y))
+     {
+--- a/src/marker_cache.cpp
++++ b/src/marker_cache.cpp
+@@ -265,7 +265,7 @@ std::shared_ptr<mapnik::marker const> ma
+                 }
+                 else
+                 {
+-                    MAPNIK_LOG_ERROR(marker_cache) << "could not intialize reader for: '" << uri << "'";
++                    MAPNIK_LOG_ERROR(marker_cache) << "could not initialize reader for: '" << uri << "'";
+                     return std::make_shared<mapnik::marker const>(mapnik::marker_null());
+                 }
+             }
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
new file mode 100644
index 0000000..28882f2
--- /dev/null
+++ b/debian/patches/occurred-typo.patch
@@ -0,0 +1,14 @@
+Description: Fix 'occured' typo, replace with 'occurred'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/load_map.cpp
++++ b/src/load_map.cpp
+@@ -751,7 +751,7 @@ void map_parser::parse_layer(Map & map,
+                 }
+                 catch (...)
+                 {
+-                    throw config_error("Unknown exception occured attempting to create datasoure for layer '" + lyr.name() + "'");
++                    throw config_error("Unknown exception occurred attempting to create datasoure for layer '" + lyr.name() + "'");
+                 }
+             }
+         }
diff --git a/debian/patches/series b/debian/patches/series
index cf1fed1..0f4fbe2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 2001_ftemplate-depth.patch
+initialize-typo.patch
+occurred-typo.patch

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



More information about the Pkg-grass-devel mailing list