[SCM] mapcache branch, master, updated. upstream/1.0.0-67-g63042ca

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 100ddc490f8544c70b96d02a423068c5ac42894b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 11 20:13:39 2013 +0200

    Drop obsolete patch: fixwithmapserv.patch.

diff --git a/debian/changelog b/debian/changelog
index b5a1ce6..26732c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
 
   * New upstream development snapshot 1.1dev+ee206af.
   * Build system changed from autotools to cmake.
+  * Drop patches:
+    - fixwithmapserv.patch (libtool no longer used)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
 
diff --git a/debian/patches/fixwithmapserv.patch b/debian/patches/fixwithmapserv.patch
deleted file mode 100644
index f26d707..0000000
--- a/debian/patches/fixwithmapserv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Set path to libmapserver.la as installed by the mapserver package.
-Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
-Last-Update: 2013-06-12
---- a/configure.in
-+++ b/configure.in
-@@ -484,7 +484,7 @@ AC_DEFUN([MAPSERVER_CHECK],[
-        AC_SUBST(MAPSERVER_ENABLED,"-DUSE_MAPSERVER")
-        AC_SUBST(MAPSERVER_DEFS,$MSDEFS)
-        AC_SUBST(MAPSERVER_INC,"-I $MAPSERVER_DIR `$MAPSERVER_DIR/mapserver-config --includes`")
--       AC_SUBST(MAPSERVER_LIB,"$MAPSERVER_DIR/libmapserver.la")
-+       AC_SUBST(MAPSERVER_LIB,"/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libmapserver.la")
-     fi
- ])
- 
diff --git a/debian/patches/series b/debian/patches/series
index e29bae7..30c372a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 includepath.patch
-fixwithmapserv.patch
 libmapcache_hardening.patch
 demo_service_js_typos.patch
 demo_service_valid_js_var.patch

-- 
Packaging for MapCache