[SCM] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit fd2cdb8076837cfe140e8b12c26c0701f11b3f93
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 22:10:44 2013 +0200

    Drop obsolete patch: allow-building-with-mapserver.patch.

diff --git a/debian/changelog b/debian/changelog
index bd5e45d..7d2e6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
     - mapcache_seed_non_zero_exit.patch (applied upstream)
     - mapcache_seed_delete_mode.patch (applied upstream)
     - mapcache_seed_typo.patch (applied upstream)
-  * 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
deleted file mode 100644
index 65fe10a..0000000
--- a/debian/patches/allow-building-with-mapserver.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 6116c28..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-allow-building-with-mapserver.patch

-- 
Packaging for MapCache