[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-132-g41e88c4

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 41e88c4988b8e884fe99caa68fb2f8d3bee640a0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 17:25:57 2013 +0200

    Drop install-threads.patch, applied upstream.

diff --git a/debian/changelog b/debian/changelog
index c4f0dfb..5448985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapserver (6.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream release: 6.4.0.
+  * Drop install-threads.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 17 Sep 2013 17:16:30 +0200
+
 mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release: 6.4.0-rc1.
diff --git a/debian/patches/install-threads.patch b/debian/patches/install-threads.patch
deleted file mode 100644
index 5d476f1..0000000
--- a/debian/patches/install-threads.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE too.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Bug: https://github.com/mapserver/mapserver/pull/4750
-Applied-Upstream: 6.4.0, https://github.com/mapserver/mapserver/commit/458d224e46c1b26ab2400ff766d4df359cc8e703
-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 b8dc8f3..9b989b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 hardening.patch
 ruby-shebang.patch
 perl-mapscript-install.patch
-install-threads.patch
 ruby-mapscript-install.patch

-- 
Packaging for MapServer