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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit e51ab8ea4f8a0eed868ea6ad8fe08933c791cbe4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 1 17:33:46 2013 +0200

    Drop obsolete patch: php_segfault.patch.

diff --git a/debian/changelog b/debian/changelog
index 18b4414..2e389c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * Update hardening.patch for CMake build.
   * Drop patches:
     - fixmapscriptvars.patch (mapscriptvars no longer used)
+    - php_segfault.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/php_segfault.patch b/debian/patches/php_segfault.patch
deleted file mode 100644
index 2f36265..0000000
--- a/debian/patches/php_segfault.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix segfault in ms_newMapObjFromString (PHP/MapScript).
-Author: Alan Boudreault <aboudreault at mapgears.com>
-Applied-Upstream: 6.2.2, https://github.com/mapserver/mapserver/commit/dc3915db24d73d00e188c0537476eac6639853a6
-Last-Update: 2013-06-14
---- a/mapscript/php/php_mapscript.c
-+++ b/mapscript/php/php_mapscript.c
-@@ -169,7 +169,7 @@
-   map = mapObj_newFromString(string, path);
- 
-   if (map == NULL) {
--    mapscript_throw_mapserver_exception("Failed to open map file \"%s\", or map file error." TSRMLS_CC,  string);
-+    mapscript_throw_mapserver_exception("Error while loading map file from string." TSRMLS_CC);
-     return;
-   }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3dcc945..fe578cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-php_segfault.patch
 mapows-contenttype.patch
 hardening.patch
 shp2img-typo.patch

-- 
Packaging for MapServer