[mapcache] 04/08: Drop typo patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Thu Apr 13 18:33:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapcache.
commit c777b98b544d991fb1554c0ddf3ac336bdf6eb61
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Apr 13 18:49:45 2017 +0200
Drop typo patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/across-typo.patch | 16 ------------
debian/patches/cmake-mapserver-include.patch | 2 +-
debian/patches/occurred-typo.patch | 38 ----------------------------
debian/patches/overridden-typo.patch | 16 ------------
debian/patches/series | 3 ---
6 files changed, 2 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bc3cdb6..3297853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapcache (1.6.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Fix 'contours' typo in manpage.
+ * Drop typo patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Thu, 13 Apr 2017 18:48:19 +0200
diff --git a/debian/patches/across-typo.patch b/debian/patches/across-typo.patch
deleted file mode 100644
index 832fb92..0000000
--- a/debian/patches/across-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'accross' typo, replace with 'across'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapserver/mapcache/pull/141
-Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf205c500a4f6793453ecaddac5
-
---- 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/cmake-mapserver-include.patch b/debian/patches/cmake-mapserver-include.patch
index 3ee588b..99443c4 100644
--- a/debian/patches/cmake-mapserver-include.patch
+++ b/debian/patches/cmake-mapserver-include.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -231,10 +231,18 @@ if(WITH_GEOTIFF)
+@@ -244,10 +244,18 @@ if(WITH_GEOTIFF)
endif (WITH_GEOTIFF)
if(WITH_MAPSERVER)
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
deleted file mode 100644
index 697ae62..0000000
--- a/debian/patches/occurred-typo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix 'occured' typo, replace with 'occurred'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapserver/mapcache/pull/141
-Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf205c500a4f6793453ecaddac5
-
---- a/include/mapcache.h
-+++ b/include/mapcache.h
-@@ -207,7 +207,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
-@@ -620,7 +620,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
deleted file mode 100644
index 304a819..0000000
--- a/debian/patches/overridden-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'overrided' typo, replace with 'overridden'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapserver/mapcache/pull/141
-Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf205c500a4f6793453ecaddac5
-
---- a/util/mapcache_seed.c
-+++ b/util/mapcache_seed.c
-@@ -1153,7 +1153,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 653353a..4c2a684 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
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
More information about the Pkg-grass-devel
mailing list