[SCM] mapserver branch, master, updated. upstream/6.0.1-25-g98327ed

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 98327ede46bfa4cfb9db03113c41207203447f15
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 15:41:26 2012 +0100

    The old function_entry typedef renamed in zend_function_entry.

diff --git a/debian/patches/php54 b/debian/patches/php54
index 3c69a10..49160df 100644
--- a/debian/patches/php54
+++ b/debian/patches/php54
@@ -1,7 +1,7 @@
 Index: mapserver/mapscript/php/php_mapscript_util.c
 ===================================================================
---- mapserver.orig/mapscript/php/php_mapscript_util.c	2012-03-05 13:20:27.000000000 +0100
-+++ mapserver/mapscript/php/php_mapscript_util.c	2012-03-05 14:55:46.000000000 +0100
+--- mapserver.orig/mapscript/php/php_mapscript_util.c	2012-03-05 15:05:16.000000000 +0100
++++ mapserver/mapscript/php/php_mapscript_util.c	2012-03-05 15:36:06.000000000 +0100
 @@ -37,12 +37,18 @@
                                         void (*zend_objects_free_object) TSRMLS_DC)
  {
@@ -42,8 +42,8 @@ Index: mapserver/mapscript/php/php_mapscript_util.c
      return retval;
 Index: mapserver/mapscript/php/image.c
 ===================================================================
---- mapserver.orig/mapscript/php/image.c	2011-12-23 11:16:03.000000000 +0100
-+++ mapserver/mapscript/php/image.c	2012-03-05 15:05:06.000000000 +0100
+--- mapserver.orig/mapscript/php/image.c	2012-03-05 15:05:16.000000000 +0100
++++ mapserver/mapscript/php/image.c	2012-03-05 15:36:06.000000000 +0100
 @@ -303,7 +303,7 @@
      /* no filename - read stdout */
  
@@ -53,3 +53,16 @@ Index: mapserver/mapscript/php/image.c
      {
          php_header(TSRMLS_C);
      }
+Index: mapserver/mapscript/php/php_mapscript.c
+===================================================================
+--- mapserver.orig/mapscript/php/php_mapscript.c	2011-12-23 11:16:03.000000000 +0100
++++ mapserver/mapscript/php/php_mapscript.c	2012-03-05 15:41:11.000000000 +0100
+@@ -899,7 +899,7 @@
+ 
+ }
+ 
+-function_entry mapscript_functions[] = {
++zend_function_entry mapscript_functions[] = {
+     PHP_FE(ms_GetVersion, NULL)
+     PHP_FE(ms_GetVersionInt,  NULL)
+     PHP_FE(ms_newLineObj, NULL)

-- 
Mapserver