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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit beb9dd16de7b204400931c24d7dbe6505c313d36
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 20:40:26 2013 +0200

    Drop obsolete patch: includepath.patch.

diff --git a/debian/changelog b/debian/changelog
index ed3a6ba..a78672f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
   * Update watch file for github releases.
   * Build system changed from autotools to cmake.
   * Drop patches:
+    - includepath.patch (no longer required)
     - fixwithmapserv.patch (libtool no longer used)
     - libmapcache_hardening.patch (libtool no longer used)
     - demo_service_js_typos.patch (applied upstream)
diff --git a/debian/patches/includepath.patch b/debian/patches/includepath.patch
deleted file mode 100644
index 71924b3..0000000
--- a/debian/patches/includepath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Set include for mapserver.h as used by the mapserver package.
-Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
-Last-Update: 2013-06-12
---- a/lib/source_mapserver.c
-+++ b/lib/source_mapserver.c
-@@ -38,7 +38,7 @@
- #endif
- #include <apr_hash.h>
- #include <apr_reslist.h>
--#include <mapserver.h>
-+#include <mapserver/mapserver.h>
- 
- /* hash table key = source->name, value = apr_reslist_t of mapObjs */
- static apr_hash_t *mapobj_container = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index b7db54b..261bd5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-includepath.patch
 mapcache_seed_typo.patch
 cmake-with-mapserver.patch
 allow-building-with-mapserver.patch

-- 
Packaging for MapCache