[SCM] mapcache branch, master, updated. upstream/1.0.0-70-g45bf213

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 45bf2135ecd20eb9f379174269830194252fe2d9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 16 19:13:43 2013 +0200

    Add patch from upstream to fix building with mapserver.

diff --git a/debian/changelog b/debian/changelog
index 8beac66..8ebb146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
     - mapcache_seed_delete_mode.patch (applied upstream)
   * Refresh mapcache_seed_typo.patch.
   * Add patch to support building with mapserver.
+  * Add patch from upstream to fix building with mapserver.
   * SONAME of libmapcache changed from libmapcache.so.0 to
     libmapcache.so.
   * Enable verbose make output.
diff --git a/debian/patches/allow-building-with-mapserver.patch b/debian/patches/allow-building-with-mapserver.patch
new file mode 100644
index 0000000..65fe10a
--- /dev/null
+++ b/debian/patches/allow-building-with-mapserver.patch
@@ -0,0 +1,32 @@
+Description: Allow building with mapserver sources (#81)
+Author: Thomas Bonfort <thomas.bonfort at gmail.com>
+Origin: https://github.com/mapserver/mapcache/commit/9cc636a0f7d0d4838623cafb57e1f4e3c3f83c1b
+Last-Update: 2013-09-16
+--- a/lib/source_mapserver.c
++++ b/lib/source_mapserver.c
+@@ -27,10 +27,11 @@
+  * DEALINGS IN THE SOFTWARE.
+  *****************************************************************************/
+ 
+-#ifdef USE_MAPSERVER
+ 
+ #include "mapcache.h"
+ #include "ezxml.h"
++
++#ifdef USE_MAPSERVER
+ #include <apr_tables.h>
+ #include <apr_strings.h>
+ #ifdef APR_HAS_THREADS
+@@ -273,7 +274,11 @@ mapcache_source* mapcache_source_mapserver_create(mapcache_context *ctx)
+   source->source.query_info = _mapcache_source_mapserver_query;
+   return (mapcache_source*)source;
+ }
+-
++#else
++mapcache_source* mapcache_source_mapserver_create(mapcache_context *ctx)
++{
++  ctx->set_error(ctx, 500, "mapserver source not configured for this build");
++}
+ #endif
+ 
+ /* vim: ts=2 sts=2 et sw=2
diff --git a/debian/patches/series b/debian/patches/series
index 6310cf4..b7db54b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 includepath.patch
 mapcache_seed_typo.patch
 cmake-with-mapserver.patch
+allow-building-with-mapserver.patch

-- 
Packaging for MapCache