[mapcache] 04/07: Refresh patches.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Feb 25 20:45:14 UTC 2016


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

sebastic pushed a commit to branch master
in repository mapcache.

commit dde8c3fd92c151b3ea9975e126cf316938af17a0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 25 21:01:50 2016 +0100

    Refresh patches.
---
 debian/patches/cmake-mapserver-include.patch | 2 +-
 debian/patches/occurred-typo.patch           | 6 +++---
 debian/patches/overridden-typo.patch         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/cmake-mapserver-include.patch b/debian/patches/cmake-mapserver-include.patch
index 7be3d2c..3ee588b 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
-@@ -222,10 +222,18 @@ if(WITH_GEOTIFF)
+@@ -231,10 +231,18 @@ if(WITH_GEOTIFF)
  endif (WITH_GEOTIFF)
  
  if(WITH_MAPSERVER)
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
index 64e9ed1..c2f8214 100644
--- a/debian/patches/occurred-typo.patch
+++ b/debian/patches/occurred-typo.patch
@@ -5,7 +5,7 @@ Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf20
 
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -172,7 +172,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=l
+@@ -175,7 +175,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.
@@ -16,7 +16,7 @@ Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf20
    * Add watch file.
 --- a/include/mapcache.h
 +++ b/include/mapcache.h
-@@ -203,7 +203,7 @@ struct mapcache_context {
+@@ -207,7 +207,7 @@ struct mapcache_context {
    void (*set_exception)(mapcache_context *ctx, char *key, char *message, ...);
  
    /**
@@ -38,7 +38,7 @@ Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf20
     * 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
+@@ -620,7 +620,7 @@ mapcache_http_response* mapcache_core_re
  
    msg = ctx->_errmsg;
    if(!msg) {
diff --git a/debian/patches/overridden-typo.patch b/debian/patches/overridden-typo.patch
index a75cd97..304a819 100644
--- a/debian/patches/overridden-typo.patch
+++ b/debian/patches/overridden-typo.patch
@@ -5,7 +5,7 @@ Applied-Upstream: https://github.com/mapserver/mapcache/commit/ac20472ef5385bf20
 
 --- a/util/mapcache_seed.c
 +++ b/util/mapcache_seed.c
-@@ -1124,7 +1124,7 @@ int main(int argc, const char **argv)
+@@ -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) {

-- 
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