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

[Bas Couwenberg]

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

    Drop obsolete patch: cmake-with-mapserver.patch.

diff --git a/debian/changelog b/debian/changelog
index 3fa9beb..bd5e45d 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 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.
diff --git a/debian/patches/cmake-with-mapserver.patch b/debian/patches/cmake-with-mapserver.patch
deleted file mode 100644
index 8cc6149..0000000
--- a/debian/patches/cmake-with-mapserver.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Add (optional) support for mapserver with CMake.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Origin: https://github.com/sebastic/mapcache/commit/d3e88cc808ea13fe4c562bdb2d867fad6fc300f2
-Bug: https://github.com/mapserver/mapcache/pull/81
-Applied-Upstream: https://github.com/mapserver/mapcache/commit/08a8265234734
-Last-Update: 2013-09-08
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@ option(WITH_TIFF "Use TIFFs as a cache b
- option(WITH_TIFF_WRITE_SUPPORT "Enable (experimental) support for writable TIFF cache backends" OFF)
- option(WITH_GEOTIFF "Allow GeoTIFF metadata creation for TIFF cache backends" OFF)
- option(WITH_PCRE "Use PCRE for regex tests" OFF)
-+option(WITH_MAPSERVER "Enable (experimental) support for the mapserver library" OFF)
- 
- find_package(PNG)
- if(PNG_FOUND)
-@@ -212,6 +213,17 @@ if(WITH_GEOTIFF)
-   endif(GEOTIFF_FOUND)
- endif (WITH_GEOTIFF)
- 
-+if(WITH_MAPSERVER)
-+   find_package(MAPSERVER)
-+  if(MAPSERVER_FOUND)
-+    include_directories(${MAPSERVER_INCLUDE_DIR})
-+    target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
-+    set (USE_MAPSERVER 1)
-+  else(MAPSERVER_FOUND)
-+    report_optional_not_found(MAPSERVER)
-+  endif(MAPSERVER_FOUND)
-+endif (WITH_MAPSERVER)
-+
- 
- if(UNIX)
- target_link_libraries(mapcache ${CMAKE_DL_LIBS} m )
-@@ -259,6 +271,7 @@ status_optional_component("TIFF" "${USE_
- status_optional_component("GeoTIFF" "${USE_GEOTIFF}" "${GEOTIFF_LIBRARY}")
- status_optional_component("Experimental TIFF write support" "${USE_TIFF_WRITE}" "${TIFF_LIBRARY}")
- status_optional_component("PCRE" "${USE_PCRE}" "${PCRE_LIBRARY}")
-+status_optional_component("Experimental mapserver support" "${USE_MAPSERVER}" "${MAPSERVER_LIBRARY}")
- 
- INSTALL(TARGETS mapcache DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
---- /dev/null
-+++ b/cmake/FindMAPSERVER.cmake
-@@ -0,0 +1,15 @@
-+
-+FIND_PATH(MAPSERVER_INCLUDE_DIR
-+    NAMES mapserver.h
-+    PATH_SUFFIXES mapserver
-+)
-+
-+FIND_LIBRARY(MAPSERVER_LIBRARY
-+    NAMES mapserver
-+)
-+
-+set(MAPSERVER_INCLUDE_DIRS ${MAPSERVER_INCLUDE_DIR})
-+set(MAPSERVER_LIBRARIES ${MAPSERVER_LIBRARY})
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
-+mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
---- a/include/mapcache-config.h.in
-+++ b/include/mapcache-config.h.in
-@@ -10,6 +10,7 @@
- #cmakedefine USE_TIFF_WRITE 1
- #cmakedefine USE_GEOTIFF 1
- #cmakedefine USE_PCRE 1
-+#cmakedefine USE_MAPSERVER 1
- 
- #cmakedefine HAVE_STRNCASECMP 1
- #cmakedefine HAVE_SYMLINK 1
diff --git a/debian/patches/series b/debian/patches/series
index f309f6f..6116c28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-cmake-with-mapserver.patch
 allow-building-with-mapserver.patch

-- 
Packaging for MapCache