[mapcache] 02/03: Add patches for various typos.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapcache.

commit 5515e75e4e74c8bc39611d47e94b4efa0aa44a78
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 7 01:11:11 2016 +0100

    Add patches for various typos.
---
 debian/changelog                     |  1 +
 debian/patches/across-typo.patch     | 15 +++++++++++
 debian/patches/occurred-typo.patch   | 48 ++++++++++++++++++++++++++++++++++++
 debian/patches/overridden-typo.patch | 15 +++++++++++
 debian/patches/series                |  3 +++
 5 files changed, 82 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d5efc0d..ad23a5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapcache (1.4.0-5) 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:02:30 +0100
 
diff --git a/debian/patches/across-typo.patch b/debian/patches/across-typo.patch
new file mode 100644
index 0000000..16cd2ea
--- /dev/null
+++ b/debian/patches/across-typo.patch
@@ -0,0 +1,15 @@
+Description: Fix 'accross' typo, replace with 'across'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapcache/pull/141
+
+--- a/lib/service_demo.c
++++ b/lib/service_demo.c
+@@ -282,7 +282,7 @@ static char *demo_head_gmaps =
+   "      return null;\n"
+   "    }\n"
+   "\n"
+-  "    // repeat accross x-axis\n"
++  "    // repeat across x-axis\n"
+   "    if (x < 0 || x >= tileRange) {\n"
+   "      x = (x % tileRange + tileRange) % tileRange;\n"
+   "    }\n"
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
new file mode 100644
index 0000000..13134d6
--- /dev/null
+++ b/debian/patches/occurred-typo.patch
@@ -0,0 +1,48 @@
+Description: Fix 'occured' typo, replace with 'occurred'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapcache/pull/141
+
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -172,7 +172,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=l
+   * Add patch to add newlines after each list item.
+   * Add patch to set the page height to 100% for the demo service.
+   * Add patch to use 4 space indenting in the generated HTML.
+-  * Add patch to return non-zero exit status if errors occured in mapcache_seed.
++  * Add patch to return non-zero exit status if errors occurred in mapcache_seed.
+   * Add patch to fix deletion of map tiles in seeder's delete mode.
+   * Add patch to fix typos in mapcache_seed.
+   * Add watch file.
+--- a/include/mapcache.h
++++ b/include/mapcache.h
+@@ -203,7 +203,7 @@ struct mapcache_context {
+   void (*set_exception)(mapcache_context *ctx, char *key, char *message, ...);
+ 
+   /**
+-   * \brief query context to know if an error has occured
++   * \brief query context to know if an error has occurred
+    * \memberof mapcache_context
+    */
+   int (*get_error)(mapcache_context * ctx);
+--- a/lib/cache_tiff.c
++++ b/lib/cache_tiff.c
+@@ -317,7 +317,7 @@ static int _mapcache_cache_tiff_get(mapc
+    * we currrently have no way of knowing if the opening failed because the tif
+    * file does not exist (which is not an error condition, as it only signals
+    * that the requested tile does not exist in the cache), or if an other error
+-   * that should be signaled occured (access denied, not a tiff file, etc...)
++   * that should be signaled occurred (access denied, not a tiff file, etc...)
+    *
+    * we ignore this case here and hope that further parts of the code will be
+    * able to detect what's happening more precisely
+--- a/lib/core.c
++++ b/lib/core.c
+@@ -616,7 +616,7 @@ mapcache_http_response* mapcache_core_re
+ 
+   msg = ctx->_errmsg;
+   if(!msg) {
+-    msg = apr_pstrdup(ctx->pool,"an unspecified error has occured");
++    msg = apr_pstrdup(ctx->pool,"an unspecified error has occurred");
+   }
+   ctx->log(ctx,MAPCACHE_ERROR,msg);
+ 
diff --git a/debian/patches/overridden-typo.patch b/debian/patches/overridden-typo.patch
new file mode 100644
index 0000000..91409e1
--- /dev/null
+++ b/debian/patches/overridden-typo.patch
@@ -0,0 +1,15 @@
+Description: Fix 'overrided' typo, replace with 'overridden'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapcache/pull/141
+
+--- a/util/mapcache_seed.c
++++ b/util/mapcache_seed.c
+@@ -1124,7 +1124,7 @@ int main(int argc, const char **argv)
+     if(cache_override) {
+       mapcache_cache *co = mapcache_configuration_get_cache(cfg, cache_override);
+       if(!co) {
+-        return usage(argv[0], "overrided cache\"%s\" to not found in configuration", cache_override);
++        return usage(argv[0], "overridden cache\"%s\" not found in configuration", cache_override);
+       } else {
+         tileset->_cache = co;
+       }
diff --git a/debian/patches/series b/debian/patches/series
index 4c2a684..653353a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 cmake-mapserver-include.patch
+across-typo.patch
+occurred-typo.patch
+overridden-typo.patch

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