Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,9 @@ include(CheckCSourceCompiles)


 set (MapServer_VERSION_MAJOR 7)
-set (MapServer_VERSION_MINOR 2)
+set (MapServer_VERSION_MINOR 4)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-beta2")
+set (MapServer_VERSION_SUFFIX "-beta1")

 set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
 set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})
@@ -33,6 +33,10 @@ endif(MapServer_IS_DEV_VERSION)
 MATH(EXPR MapServer_VERSION_NUM "${MapServer_VERSION_MAJOR}*10000+${MapServer_VERSION_MINOR}*100+${MapServer_VERSION_REVISION}")

 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+# Add custom function to check Python modules are installed
+include(FindPythonModule)
+
 if (APPLE)
  set(CMAKE_FIND_FRAMEWORK "LAST")
 endif (APPLE)
@@ -142,6 +146,7 @@ option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver shoul
 option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
 option(WITH_PYTHON "Enable Python mapscript support" OFF)
 option(WITH_PHP "Enable PHP mapscript support" OFF)
+option(WITH_PHPNG "Enable PHPNG (SWIG) mapscript support" OFF)
 option(WITH_PERL "Enable Perl mapscript support" OFF)
 option(WITH_RUBY "Enable Ruby mapscript support" OFF)
 option(WITH_JAVA "Enable Java mapscript support" OFF)
@@ -864,6 +869,11 @@ if(WITH_PHP)
   set(USE_PHP_MAPSCRIPT 1)
 endif(WITH_PHP)

+if(WITH_PHPNG)
+   add_subdirectory("mapscript/phpng")
+   set(USE_PHPNG_MAPSCRIPT 1)
+endif(WITH_PHPNG)
+
 if(WITH_APACHE_MODULE)
   add_subdirectory("apache")
   set(USE_APACHE_MODULE 1)
@@ -896,6 +906,9 @@ endif(UNIX)

 if (WIN32)
    ms_link_libraries( ${MS_EXTERNAL_LIBS} ws2_32.lib)
+    if (MSVC)
+        set_target_properties(mapserver PROPERTIES COMPILE_FLAGS "/wd4267 /wd4244 /wd4018")
+    endif(MSVC)
 endif (WIN32)

 configure_file (
@@ -982,6 +995,7 @@ status_optional_feature("XML Mapfile support" "${USE_XMLMAPFILE}")
 message(STATUS " * Mapscripts")
 status_optional_feature("Python" "${USE_PYTHON_MAPSCRIPT}")
 status_optional_feature("PHP" "${USE_PHP_MAPSCRIPT}")
+status_optional_feature("PHPNG" "${USE_PHPNG_MAPSCRIPT}")
 status_optional_feature("PERL" "${USE_PERL_MAPSCRIPT}")
 status_optional_feature("RUBY" "${USE_RUBY_MAPSCRIPT}")
 status_optional_feature("JAVA" "${USE_JAVA_MAPSCRIPT}")

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
 # How to contribute to MapServer

 Contributions to the MapServer project are most welcome, and can take many forms such as detailed bug reports, documentation, 
-tests, features, and patches. 
+tests, features, and patches.  Note that all contributions are managed by the MapServer [Project Steering Committee](https://mapserver.org/psc.html).

 ## Bugs and Help

@@ -18,15 +18,15 @@ For professional support please see the [MapServer Service Providers page](http:

 ## Development

-A seperate [mapserver-dev mailing list](http://lists.osgeo.org/mailman/listinfo/mapserver-dev) is available for developers
+A separate [mapserver-dev mailing list](http://lists.osgeo.org/mailman/listinfo/mapserver-dev) is available for developers
 working on the MapServer code. 

-Details on using GitHub can be found on the [MapServer GutHub page](http://mapserver.org/development/git.html)  
+Details on using GitHub can be found on the [MapServer GitHub page](http://mapserver.org/development/git.html)  

 Additional developer notes can be found in the [MapServer wiki](https://github.com/mapserver/mapserver/wiki#developer-notes), including
 coding style and guidelines, memory management, and working with Git. 

 ## Documentation

-The MapServer documentation is stored in a [seperate repository](https://github.com/mapserver/docs). Please submit any documentation
+The MapServer documentation is stored in a [separate repository](https://github.com/mapserver/docs). Please submit any documentation
 issues or changes there. See the [Documentation Development Guide](http://mapserver.org/development/documentation.html) for further details. 
--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -12,9 +12,38 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/

+7.4.0-beta1 release (2019-3-29)
+-------------------------------
+
+- Python MapScript binding is available as installable Wheels with a full test suite and examples
+
+- C# MapScript binding is now compatible with .NET Core
+
+- PHP 7 MapScript binding support - both PHP/MapScript and Swig/MapScript
+
+- Added workaround to allow compiling against Proj 6 (#5766)
+
+7.2.2 release (2019-2-19)
+--------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
+7.2.1 release (2018-10-1)
+--------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
+7.2.0 release (2018-07-23)
+--------------------------
+
+- Fixed issue with ring handling with polygons in MVT support (#5626)
+
+- No other major changes, see detailed changelog for bug fixes
+
 7.2.0-beta2 release (2018-6-13)

 - Update beta1 release notes to remove reference to PHP7 support
+
 - No other major changes, see detailed changelog for bug fixes

 7.2.0-beta1 release (2018-5-9)

--- a/INSTALL.CMAKE
+++ b/INSTALL.CMAKE
@@ -147,7 +147,7 @@ Refer to the CMakeLists.txt file for up-to-date options.
 - 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)
+ - option(WITH_PHP "Enable PHP mapscript support" OFF)
 - option(WITH_PERL "Enable Perl mapscript support" OFF)
 - option(WITH_RUBY "Enable Ruby mapscript support" OFF)
 - option(WITH_JAVA "Enable Java mapscript support" OFF)

--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,13 @@ AUTOTEST_OPTS=-strict -q
 PHP_MAPSCRIPT=build/mapscript/php/php_mapscript.so
 PYTHON_MAPSCRIPT_PATH=build/mapscript/python
 JAVA_MAPSCRIPT_PATH=build/mapscript/java
+CSHARP_MAPSCRIPT_PATH=build/mapscript/csharp
 BUILDPATH=../../build
 FLEX=flex
 YACC=yacc
 CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage" -DCMAKE_CXX_FLAGS="--coverage" \
 			  -DCMAKE_SHARED_LINKER_FLAGS="-lgcov" -DWITH_CLIENT_WMS=1 \
-			  -DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_PHP=1 \
+			  -DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_CSHARP=1 -DWITH_PHP=1 \
 			  -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREAD_SAFETY=1 -DWITH_FRIBIDI=1 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
 			  -DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1 -DWITH_HARFBUZZ=1 -DWITH_POINT_Z_M=1
 all: cmakebuild
@@ -37,16 +38,23 @@ query-testcase:
 mspython-testcase:
 	test -f "$(PYTHON_MAPSCRIPT_PATH)/_mapscript.so" && (export PYTHONPATH="../../$(PYTHON_MAPSCRIPT_PATH)" && cd msautotest/mspython && python run_all_tests.py)

+mspython-wheel:
+	cd build && cmake --build . --target pythonmapscript-wheel
+
 php-testcase:
 	test -f "$(PHP_MAPSCRIPT)" && (export PHP_MAPSCRIPT_SO="../../$(PHP_MAPSCRIPT)" && cd msautotest/php && ./run_test.sh)

 java-testcase:
 	test -d "$(JAVA_MAPSCRIPT_PATH)" && (export JAVA_MAPSCRIPT_SO="../../$(JAVA_MAPSCRIPT_PATH)" && cd mapscript/java && ./run_test.sh)

+csharp-testcase:
+	test -d "$(CSHARP_MAPSCRIPT_PATH)" && (export CSHARP_MAPSCRIPT_SO="../../$(CSHARP_MAPSCRIPT_PATH)" && cd mapscript/csharp && ./run_test.sh)
+
 test:  cmakebuild
 	@$(MAKE) $(MFLAGS)	wxs-testcase renderers-testcase misc-testcase gdal-testcase query-testcase mspython-testcase
 	@./print-test-results.sh
 	@$(MAKE) $(MFLAGS)	php-testcase
+	@$(MAKE) $(MFLAGS)	csharp-testcase


 lexer: maplexer.c

--- a/README
+++ b/README
+MapServer
+=========
+
+| |Build Status| |Appveyor Build Status|
+
 -------
 Summary
 -------
   
-   
 MapServer is a system for developing web-based GIS applications. 
 The basic system consists of a CGI program that can be configured to 
 respond to a variety of spatial requests like making maps, scalebars, 
@@ -15,7 +19,7 @@ visit:

  http://www.mapserver.org/

-Bug reports and enhancment submissions can be reported in the MapServer 
+Bug reports and enhancement submissions can be reported in the MapServer 
 issue tracker at the following url.   If you do make changes and/or enhancements, 
 please let us know so that they might be incorporated into future releases.

@@ -28,9 +32,8 @@ Join the MapServer user mailing list online at:

 

-----------
 Credits
-----------
+-------

 MapServer was originally written by Stephen Lime. Major funding for development of 
 MapServer has been provided by NASA through cooperative argreements with 
@@ -61,13 +64,12 @@ Portions derived from Shapelib, Copyright 1995-1999 Frank Warmerdam.

 Supporting packages are covered by their own copyrights.

-----------
 License
-----------
+-------

 ::

-  Copyright (c) 2008-2018 Open Source Geospatial Foundation.
+  Copyright (c) 2008-2019 Open Source Geospatial Foundation.
  Copyright (c) 1996-2008 Regents of the University of Minnesota.

  Permission is hereby granted, free of charge, to any person obtaining a copy 
@@ -89,3 +91,8 @@ License
  SOFTWARE.


+.. |Build Status| image:: https://travis-ci.org/mapserver/mapserver.svg?branch=master
+   :target: https://travis-ci.org/mapserver/mapserver
+
+.. |Appveyor Build Status| image:: https://ci.appveyor.com/api/projects/status/vw1n07095a8bg23u?svg=true
+   :target: https://ci.appveyor.com/project/mapserver/mapserver
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,8 +7,7 @@ require 'socket'
 VAGRANTFILE_API_VERSION = "2"

 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.box = "ubuntu/trusty64"

  config.vm.hostname = "mapserver-vagrant"

@@ -20,6 +19,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.name = "mapserver-vagrant"
   end

+  # Unless explicitly declined, use the VM host's file system to cache
+  # .deb files to avoid repeated downloads on each vagrant up
+  unless File.exists?("../.no_apt_cache")
+    cache_dir = "../apt-cache/#{config.vm.box}"
+    FileUtils.mkdir_p(cache_dir) unless Dir.exists?(cache_dir)
+    puts "Using local apt cache, #{cache_dir}"
+    config.vm.synced_folder cache_dir, "/var/cache/apt/archives"
+  end
+
  config.vm.provision "shell", path: "scripts/vagrant/virtualbox-fix.sh"
  config.vm.provision "shell", path: "scripts/vagrant/packages.sh"
  config.vm.provision "shell", path: "scripts/vagrant/postgis.sh"

--- a/cmake/FindPHP.cmake
+++ b/cmake/FindPHP.cmake
+# - Find PHP
+# This module finds if PHP is installed and determines where the include files
+# and libraries are. It also determines what the name of the library is. This
+# code sets the following variables:
+#
+#  PHP_INCLUDE_PATH       = path to where php.h can be found
+#  PHP_EXECUTABLE         = full path to the php binary
+#
+
+SET(PHP_FOUND "NO")
+
+SET(PHP_POSSIBLE_INCLUDE_PATHS
+  /usr/include/php
+  /usr/local/include/php
+  /usr/include/php
+  /usr/local/include/php
+  /usr/local/apache/php
+  ${PHP_INCLUDES}
+)
+
+find_library(PHP_LIBRARY NAMES php5ts php5 php7ts php7 PATHS /sw /opt/local)
+
+if(WIN32)
+  string(SUBSTRING $ENV{VSCMD_VER} 0 2 VSCMD_VER)
+  SET(PHP_INCLUDE_PATH "C:/php-sdk/phpmaster/vc${VSCMD_VER}/$ENV{VSCMD_ARG_TGT_ARCH}/php-src")
+  SET(PHP_POSSIBLE_INCLUDE_PATHS ${PHP_INCLUDE_PATH})
+  if(CMAKE_CL_64)
+    SET(PHP_INCLUDE_PATH "${PHP_INCLUDE_PATH}/$ENV{PLATFORM}")
+  endif(CMAKE_CL_64)
+  if(WITH_THREAD_SAFETY)
+    SET(PHP_INCLUDE_PATH "${PHP_INCLUDE_PATH}/Release_TS")
+    SET(PHP_LIBRARY_NAMES php5ts php7ts)
+  else(WITH_THREAD_SAFETY)
+    SET(PHP_INCLUDE_PATH "${PHP_INCLUDE_PATH}/Release")
+    SET(PHP_LIBRARY_NAMES php5 php7)
+  endif(WITH_THREAD_SAFETY)
+    find_library(PHP_LIBRARY NAMES ${PHP_LIBRARY_NAMES} PATHS ${PHP_INCLUDE_PATH})
+endif(WIN32)
+
+
+FIND_PATH(PHP_FOUND_INCLUDE_PATH main/php.h ${PHP_POSSIBLE_INCLUDE_PATHS})
+
+IF(PHP_FOUND_INCLUDE_PATH)
+  SET(php_paths "${PHP_POSSIBLE_INCLUDE_PATHS}")
+  FOREACH(php_path Zend main TSRM)
+    SET(php_paths ${php_paths} "${PHP_FOUND_INCLUDE_PATH}/${php_path}")
+  ENDFOREACH(php_path Zend main TSRM)
+  SET(PHP_INCLUDE_PATH "${php_paths}" INTERNAL "PHP include paths")
+ENDIF(PHP_FOUND_INCLUDE_PATH)
+
+FIND_PROGRAM(PHP_EXECUTABLE
+  NAMES php
+  PATHS
+  /usr/local/bin
+  )
+
+MARK_AS_ADVANCED(
+  PHP_EXECUTABLE
+  PHP_FOUND_INCLUDE_PATH
+  )
+
+IF( NOT PHP_CONFIG_EXECUTABLE )
+FIND_PROGRAM(PHP_CONFIG_EXECUTABLE
+  NAMES php-config
+  )
+ENDIF( NOT PHP_CONFIG_EXECUTABLE )
+
+IF(PHP_CONFIG_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${PHP_CONFIG_EXECUTABLE} --version
+    OUTPUT_VARIABLE PHP_VERSION)
+  STRING(REPLACE "\n" "" PHP_VERSION "${PHP_VERSION}")
+
+  EXECUTE_PROCESS(COMMAND ${PHP_CONFIG_EXECUTABLE} --extension-dir
+    OUTPUT_VARIABLE PHP_EXTENSION_DIR)
+  STRING(REPLACE "\n" "" PHP_EXTENSION_DIR "${PHP_EXTENSION_DIR}")
+
+  EXECUTE_PROCESS(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes
+    OUTPUT_VARIABLE PHP_INCLUDES)
+  STRING(REPLACE "-I" "" PHP_INCLUDES "${PHP_INCLUDES}")
+  STRING(REPLACE " " ";" PHP_INCLUDES "${PHP_INCLUDES}")
+  STRING(REPLACE "\n" "" PHP_INCLUDES "${PHP_INCLUDES}")
+  LIST(GET PHP_INCLUDES 0 PHP_INCLUDE_DIR)
+
+  set(PHP_MAIN_INCLUDE_DIR ${PHP_INCLUDE_DIR}/main)
+  set(PHP_TSRM_INCLUDE_DIR ${PHP_INCLUDE_DIR}/TSRM)
+  set(PHP_ZEND_INCLUDE_DIR ${PHP_INCLUDE_DIR}/Zend)
+  set(PHP_REGEX_INCLUDE_DIR ${PHP_INCLUDE_DIR}/regex)
+  set(PHP_EXT_INCLUDE_DIR ${PHP_INCLUDE_DIR}/ext)
+  set(PHP_DATE_INCLUDE_DIR ${PHP_INCLUDE_DIR}/ext/date/lib)
+  set(PHP_STANDARD_INCLUDE_DIR ${PHP_INCLUDE_DIR}/ext/standard)
+
+  MESSAGE(STATUS ${PHP_MAIN_INCLUDE_DIR})
+
+  IF(NOT PHP_INCLUDE_PATH)
+    set(PHP_INCLUDE_PATH ${PHP_INCLUDES})
+  ENDIF(NOT PHP_INCLUDE_PATH)
+
+  IF(PHP_VERSION LESS 5)
+    MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
+  ENDIF(PHP_VERSION LESS 5)
+
+  IF(PHP_EXECUTABLE AND PHP_INCLUDES)
+    set(PHP_FOUND "yes")
+    MESSAGE(STATUS "Found PHP-Version ${PHP_VERSION} (using ${PHP_CONFIG_EXECUTABLE})")
+  ENDIF(PHP_EXECUTABLE AND PHP_INCLUDES)
+
+  FIND_PROGRAM(PHPUNIT_EXECUTABLE
+    NAMES phpunit phpunit2
+    PATHS
+    /usr/local/bin
+  )
+
+  IF(PHPUNIT_EXECUTABLE)
+    MESSAGE(STATUS "Found phpunit: ${PHPUNIT_EXECUTABLE}")
+  ENDIF(PHPUNIT_EXECUTABLE)
+
+ENDIF(PHP_CONFIG_EXECUTABLE)
--- a/cmake/FindPHP5.cmake
+++ b/cmake/FindPHP5.cmake
-# - Find PHP5
-# This module finds if PHP5 is installed and determines where the include files
-# and libraries are. It also determines what the name of the library is. This
-# code sets the following variables:
-#
-#  PHP5_INCLUDE_PATH       = path to where php.h can be found
-#  PHP5_EXECUTABLE         = full path to the php4 binary
-#
-#  file is derived from FindPHP4.cmake
-#
-
-SET(PHP5_FOUND "NO")
-
-SET(PHP5_POSSIBLE_INCLUDE_PATHS
-  /usr/include/php5
-  /usr/local/include/php5
-  /usr/include/php
-  /usr/local/include/php
-  /usr/local/apache/php
-  ${PHP5_INCLUDES}
-  )
-
-SET(PHP5_POSSIBLE_LIB_PATHS
-  /usr/lib
-if(WIN32)
-  ${PHP5_INCLUDES}/Release_TS
-endif(WIN32)
-  )
-
-find_library(PHP5_LIBRARY
-   NAMES php5ts.lib
-   PATHS /sw /opt/local ${PHP5_INCLUDES}/Release_TS
-)
-  
-FIND_PATH(PHP5_FOUND_INCLUDE_PATH main/php.h
-  ${PHP5_POSSIBLE_INCLUDE_PATHS})
-
-IF(PHP5_FOUND_INCLUDE_PATH)
-  SET(php5_paths "${PHP5_POSSIBLE_INCLUDE_PATHS}")
-  FOREACH(php5_path Zend main TSRM)
-    SET(php5_paths ${php5_paths} "${PHP5_FOUND_INCLUDE_PATH}/${php5_path}")
-  ENDFOREACH(php5_path Zend main TSRM)
-  SET(PHP5_INCLUDE_PATH "${php5_paths}" INTERNAL "PHP5 include paths")
-ENDIF(PHP5_FOUND_INCLUDE_PATH)
-
-FIND_PROGRAM(PHP5_EXECUTABLE
-  NAMES php5 php
-  PATHS
-  /usr/local/bin
-  )
-
-MARK_AS_ADVANCED(
-  PHP5_EXECUTABLE
-  PHP5_FOUND_INCLUDE_PATH
-  )
-
-IF( NOT PHP5_CONFIG_EXECUTABLE )
-FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE
-  NAMES php5-config php-config
-  )
-ENDIF( NOT PHP5_CONFIG_EXECUTABLE )
-
-IF(PHP5_CONFIG_EXECUTABLE)
-  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
-    OUTPUT_VARIABLE PHP5_VERSION)
-  STRING(REPLACE "\n" "" PHP5_VERSION "${PHP5_VERSION}")
-
-  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --extension-dir
-    OUTPUT_VARIABLE PHP5_EXTENSION_DIR)
-  STRING(REPLACE "\n" "" PHP5_EXTENSION_DIR "${PHP5_EXTENSION_DIR}")
-
-  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --includes
-    OUTPUT_VARIABLE PHP5_INCLUDES)
-  STRING(REPLACE "-I" "" PHP5_INCLUDES "${PHP5_INCLUDES}")
-  STRING(REPLACE " " ";" PHP5_INCLUDES "${PHP5_INCLUDES}")
-  STRING(REPLACE "\n" "" PHP5_INCLUDES "${PHP5_INCLUDES}")
-  LIST(GET PHP5_INCLUDES 0 PHP5_INCLUDE_DIR)
-
-  set(PHP5_MAIN_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/main)
-  set(PHP5_TSRM_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/TSRM)
-  set(PHP5_ZEND_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/Zend)
-  set(PHP5_REGEX_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/regex)
-  set(PHP5_EXT_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext)
-  set(PHP5_DATE_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/date/lib)
-  set(PHP5_STANDARD_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/standard)
-
-  MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
-
-  IF(NOT PHP5_INCLUDE_PATH)
-    set(PHP5_INCLUDE_PATH ${PHP5_INCLUDES})
-  ENDIF(NOT PHP5_INCLUDE_PATH)
-
-  IF(PHP5_VERSION LESS 5)
-    MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
-  ENDIF(PHP5_VERSION LESS 5)
-
-  IF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
-    set(PHP5_FOUND "yes")
-    MESSAGE(STATUS "Found PHP5-Version ${PHP5_VERSION} (using ${PHP5_CONFIG_EXECUTABLE})")
-  ENDIF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
-
-  FIND_PROGRAM(PHPUNIT_EXECUTABLE
-    NAMES phpunit phpunit2
-    PATHS
-    /usr/local/bin
-  )
-
-  IF(PHPUNIT_EXECUTABLE)
-    MESSAGE(STATUS "Found phpunit: ${PHPUNIT_EXECUTABLE}")
-  ENDIF(PHPUNIT_EXECUTABLE)
-
-ENDIF(PHP5_CONFIG_EXECUTABLE)
--- a/cmake/FindPythonModule.cmake
+++ b/cmake/FindPythonModule.cmake
+# Find if a Python module is installed
+# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html
+# To use do: find_python_module(PyQt4 REQUIRED)
+function(find_python_module module)
+	string(TOUPPER ${module} module_upper)
+	if(NOT PY_${module_upper})
+		if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")
+			set(${module}_FIND_REQUIRED TRUE)
+		endif()
+		# A module's location is usually a directory, but for binary modules
+		# it's a .so file.
+		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" 
+			"import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
+			RESULT_VARIABLE _${module}_status 
+			OUTPUT_VARIABLE _${module}_location
+			ERROR_QUIET 
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		if(NOT _${module}_status)
+			set(PY_${module_upper} ${_${module}_location} CACHE STRING 
+				"Location of Python module ${module}")
+		endif(NOT _${module}_status)
+	endif(NOT PY_${module_upper})
+	find_package_handle_standard_args(PY_${module} DEFAULT_MSG PY_${module_upper})
+endfunction(find_python_module)
--- a/debian/changelog
+++ b/debian/changelog
-mapserver (7.2.0~beta2-1~exp2) UNRELEASED; urgency=medium
+mapserver (7.4.0~beta1-1~exp1) experimental; urgency=medium

+  * New upstream beta release.
+  * Remove package name from lintian overrides.
+  * Re-enable PHP MapScript, support for PHP 7 available now.
+  * Add python-setuptools to build dependencies.
+  * Switch Python MapScript to Python 3.
+  * Drop Ruby MapScript, causes FTBFS.
+  * Update symbols for amd64.
+  * Add patch to fix spelling errors.
+  * Use ttf-bitstream-vera instead of embedded copy.
+  * Add patch for shebang in Python MapScript example scripts.
+  * Set INSTALL_LIB_DIR to Multi-Arch path.
+  * Move all CMake options to dh_auto_configure override.
+  * Also build PHPNG MapScript (based on SWIG).
+  * Drop unused shlibs:Depends from cgi-mapserver package.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 30 Mar 2019 09:59:55 +0100
+
+mapserver (7.2.2-1) unstable; urgency=medium
+
+  * Update symbols for other architectures.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 20 Feb 2019 05:43:10 +0100
+
+mapserver (7.2.2-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Add Build-Depends-Package field to symbols file.
+  * Bump Standards-Version to 4.3.0, no changes.
+  * Refresh patches.
+  * Update copyright years for Open Source Geospatial Foundation.
+  * Update symbols for amd64.
+  * Add lintian overrides for file-references-package-build-path.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 19 Feb 2019 18:07:57 +0100
+
+mapserver (7.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.2.1, no changes.
+  * Drop patches applied upstream. Refresh remaining patches.
+  * Fix docs install for README rename.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 02 Oct 2018 07:11:40 +0200
+
+mapserver (7.2.0-5) unstable; urgency=medium
+
+  * Bump Standards-Version to 4.2.0, no changes.
+  * Add patch to fix FTBFS with CMake 3.12.x.
+    (closes: #906605)
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 19 Aug 2018 09:45:57 +0200
+
+mapserver (7.2.0-4) unstable; urgency=medium
+
+  * Drop autopkgtest to test installability.
+  * Add lintian override for testsuite-autopkgtest-missing.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 31 Jul 2018 21:45:41 +0200
+
+mapserver (7.2.0-3) unstable; urgency=medium
+
+  * Add upstream patch to update HISTORY.TXT for 7.2.0 release.
+  * Update symbols for mipsel.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 24 Jul 2018 20:02:20 +0200
+
+mapserver (7.2.0-2) unstable; urgency=medium
+
+  * Add patch to remove -beta2 version suffix.
+  * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 24 Jul 2018 14:11:34 +0200
+
+mapserver (7.2.0-1) unstable; urgency=medium
+
+  * New upstream release.
  * Bump Standards-Version to 4.1.5, no changes.
+  * Update symbols for amd64.
+  * Strip pre-releases from symbols version.
+  * Move from experimental to unstable.

- -- Bas Couwenberg <sebastic@debian.org>  Thu, 05 Jul 2018 10:26:42 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 24 Jul 2018 08:08:43 +0200

 mapserver (7.2.0~beta2-1~exp1) experimental; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
 Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 9.20160114),
-#               dh-php,
+               dh-php,
               dh-python,
               dpkg-dev (>= 1.16.1.1),
               cmake (>= 2.8.12.1-1.2),
@@ -32,22 +32,20 @@ Build-Depends: debhelper (>= 9.20160114),
               libxml2-dev,
               libxslt1-dev,
               zlib1g-dev (>= 1.1.4),
-#               php-dev,
+               php-dev,
               pkg-config,
               pkg-kde-tools,
               protobuf-c-compiler,
-               python-all (>= 2.6.6-3~),
-               python-all-dev (>= 2.6.6-3~),
-               ruby,
-               ruby-all-dev,
-               gem2deb,
+               python3-all,
+               python3-all-dev,
+               python3-setuptools,
               swig,
               docbook2x,
               docbook-xsl,
               docbook-xml,
               xsltproc
 Build-Conflicts: libcurl3-openssl-dev
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapserver
 Vcs-Git: https://salsa.debian.org/debian-gis-team/mapserver.git -b experimental
 Homepage: http://www.mapserver.org
@@ -62,9 +60,9 @@ Suggests: cgi-mapserver,
          mapserver-bin,
          mapserver-doc,
          libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Pre-Depends: ${misc:Pre-Depends}
 Description: Shared library for MapServer
 This package contains the shared library.
@@ -83,9 +81,9 @@ Suggests: cgi-mapserver,
          mapserver-bin,
          mapserver-doc,
          libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
        libmapserver1-dev (<< 7.0.0~)
 Replaces: libmapserver-6.2.1-dev (<< 6.4.0-1~),
@@ -102,13 +100,12 @@ Package: cgi-mapserver
 Architecture: any
 Section: web
 Depends: mapserver-bin,
-         ${shlibs:Depends},
         ${misc:Depends}
 Suggests: mapserver-doc,
          libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Description: CGI executable for MapServer
 This package contains the mapserv CGI program. It provides the
 MapServer template language, and can be used to implement Web Map
@@ -128,9 +125,9 @@ Suggests: cgi-mapserver,
          mapserver-doc,
          shapelib,
          libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Description: MapServer utilities
 This package provides command-line utilities for MapServer.
 .
@@ -145,9 +142,9 @@ Section: doc
 Depends: ${misc:Depends}
 Suggests: cgi-mapserver,
          libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Description: documentation for MapServer
 This package provides some brief documentation for MapServer.
 .
@@ -156,19 +153,37 @@ Description: documentation for MapServer
 functionality in MapScript is provided by the suggested mapscript
 library packages.

-#Package: php-mapscript
-#Architecture: any
-#Section: php
-#Depends: ${php:Depends},
-#         ${shlibs:Depends},
-#         ${misc:Depends}
-#Suggests: mapserver-bin,
-#          mapserver-doc
-#Description: php-cgi module for MapServer
-# PHP MapScript provides MapServer functions for PHP scripts.
-# .
-# MapServer is a CGI-based framework for Internet map services which
-# supports Open Geospatial Consortium (OGC) standards.
+Package: php-mapscript
+Architecture: any
+Section: php
+Depends: ${php:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: mapserver-bin,
+          mapserver-doc
+Description: php-cgi module for MapServer
+ PHP MapScript provides MapServer functions for PHP scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
+ .
+ This package provides the traditional MapScript for PHP.
+
+Package: php-mapscript-ng
+Architecture: any
+Section: php
+Depends: ${php:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: mapserver-bin,
+          mapserver-doc
+Description: PHP MapServer module (SWIG)
+ PHP MapScript provides MapServer functions for PHP scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
+ .
+ This package provides MapScript for PHP based on SWIG.

 Package: libmapscript-perl
 Architecture: any
@@ -187,47 +202,22 @@ Description: Perl MapServer module
 MapServer is a CGI-based framework for Internet map services which
 supports Open Geospatial Consortium (OGC) standards.

-Package: python-mapscript
+Package: python3-mapscript
 Architecture: any
 Section: python
-Depends: ${python:Depends},
+Depends: ttf-bitstream-vera,
+         ${python3:Depends},
         ${shlibs:Depends},
         ${misc:Depends}
 Suggests: mapserver-bin,
          mapserver-doc
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
 Description: Python library for MapServer
 Python MapScript provides MapServer functions for Python scripts.
 .
 MapServer is a CGI-based framework for Internet map services which
 supports Open Geospatial Consortium (OGC) standards.

-Package: ruby-mapscript
-Architecture: any
-Section: ruby
-Depends: ruby | ruby-interpreter,
-         ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: mapserver-bin,
-          mapserver-doc
-Breaks: libmapscript-ruby (<< 6.4.0-1~),
-        libmapscript-ruby1.8 (<< 6.4.0-1~),
-        libmapscript-ruby1.9.1 (<< 6.4.0-1~)
-Provides: libmapscript-ruby,
-          libmapscript-ruby1.8,
-          libmapscript-ruby1.9.1
-Replaces: libmapscript-ruby (<< 6.4.0-1~),
-          libmapscript-ruby1.8 (<< 6.4.0-1~),
-          libmapscript-ruby1.9.1 (<< 6.4.0-1~)
-XB-Ruby-Versions: all
-Description: MapServer library for Ruby
- Ruby MapScript provides MapServer functions for Ruby scripts.
- .
- This package contains examples and the MapServer functions for Ruby.
- .
- MapServer is a CGI-based framework for Internet map services which
- supports Open Geospatial Consortium (OGC) standards.
-
 Package: libmapscript-java
 Architecture: any
 Section: java

--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: The MapServer team <mapserver-dev@lists.osgeo.org>
 Source: https://github.com/mapserver/mapserver

 Files: *
-Copyright:         2008-2018, Open Source Geospatial Foundation.
+Copyright:         2008-2019, Open Source Geospatial Foundation.
             2006-2007, 2017, Tom Kralidis <tomkralidis@gmail.com>
                   1996-2015, Regents of the University of Minnesota.
                  2011, 2013, Alan Boudreault, MapGears

--- a/debian/libmapscript-java.lintian-overrides
+++ b/debian/libmapscript-java.lintian-overrides
+# https://github.com/mapserver/mapserver/issues/5746
+file-references-package-build-path *
+
--- a/debian/libmapscript-perl.lintian-overrides
+++ b/debian/libmapscript-perl.lintian-overrides
+# https://github.com/mapserver/mapserver/issues/5746
+file-references-package-build-path *
+
--- a/debian/libmapserver2.lintian-overrides
+++ b/debian/libmapserver2.lintian-overrides
+# https://github.com/mapserver/mapserver/issues/5746
+file-references-package-build-path *
+
--- a/debian/libmapserver2.symbols
+++ b/debian/libmapserver2.symbols
--- a/debian/mapscript-ng.ini
+++ b/debian/mapscript-ng.ini
+extension=php_mapscriptng.so
--- a/debian/mapserver-bin.lintian-overrides
+++ b/debian/mapserver-bin.lintian-overrides
+# https://github.com/mapserver/mapserver/issues/5746
+file-references-package-build-path *
+
--- a/debian/mapserver-doc.docs
+++ b/debian/mapserver-doc.docs
-README
+README.rst
 fonts
 symbols
 MIGRATION_GUIDE.txt