[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 5221eec665c76fe3f3972fdc2db441adb1284eef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 7 21:24:14 2013 +0200

    Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.

diff --git a/debian/changelog b/debian/changelog
index 62ce886..c6f0585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
   * New upstream release: 6.4.0-rc1.
   * Rename WITH_THREADS to WITH_THREAD_SAFETY.
   * Drop patch install-ruby-mapscript.patch, applied upstream.
+  * Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/patches/install-threads.patch b/debian/patches/install-threads.patch
new file mode 100644
index 0000000..ce4832a
--- /dev/null
+++ b/debian/patches/install-threads.patch
@@ -0,0 +1,14 @@
+Description: Rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE too.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-09-07
+--- a/INSTALL.CMAKE
++++ b/INSTALL.CMAKE
+@@ -140,7 +140,7 @@ of these can be enabled or disabled by p
+  - option(WITH_WFS "Enable WFS Server support (requires PROJ and OGR support)" ON)
+  - option(WITH_WCS "Enable WCS Server support (requires PROJ and GDAL support)" ON)
+  - option(WITH_LIBXML2 "Choose if libxml2 support should be built in (used for sos, wcs 1.1,2.0 and wfs 1.1)" ON)
+- - option(WITH_THREADS "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
++ - option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
+  - option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
+  - option(WITH_PYTHON "Enable Python mapscript support" OFF)
+  - option(WITH_PHP "Enable Python mapscript support" OFF)
diff --git a/debian/patches/series b/debian/patches/series
index d157b06..b1b1b94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hardening.patch
 ruby-shebang.patch
 perl-mapscript-install.patch
+install-threads.patch

-- 
Packaging for MapServer