diff -Nru mapserver-7.0.0/debian/changelog mapserver-7.0.0/debian/changelog --- mapserver-7.0.0/debian/changelog 2016-01-26 00:38:57.000000000 -0800 +++ mapserver-7.0.0/debian/changelog 2016-02-18 16:43:59.000000000 -0800 @@ -1,3 +1,10 @@ +mapserver (7.0.0-9ubuntu1) xenial; urgency=medium + + * Disable php5-mapscript while swig does not support PHP 7.0 + (LP: #1546823). + + -- Nishanth Aravamudan Thu, 18 Feb 2016 16:24:09 -0800 + mapserver (7.0.0-9) unstable; urgency=medium * Update Vcs-Git URL to use HTTPS. diff -Nru mapserver-7.0.0/debian/control mapserver-7.0.0/debian/control --- mapserver-7.0.0/debian/control 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/control 2016-02-18 16:43:59.000000000 -0800 @@ -1,5 +1,6 @@ Source: mapserver -Maintainer: Debian GIS Project +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine , Alan Boudreault , Bas Couwenberg @@ -29,7 +30,6 @@ libxml2-dev, libxslt1-dev, zlib1g-dev (>= 1.1.4), - php5-dev, pkg-config, pkg-kde-tools, python-all (>= 2.6.6-3~), @@ -58,7 +58,6 @@ mapserver-bin, mapserver-doc, libmapscript-perl, - php5-mapscript, python-mapscript, ruby-mapscript Pre-Depends: ${misc:Pre-Depends} @@ -95,7 +94,6 @@ mapserver-bin, mapserver-doc, libmapscript-perl, - php5-mapscript, python-mapscript, ruby-mapscript Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~), @@ -118,7 +116,6 @@ Suggests: mapserver-bin, mapserver-doc, libmapscript-perl, - php5-mapscript, python-mapscript, ruby-mapscript Description: CGI executable for MapServer @@ -140,7 +137,6 @@ mapserver-doc, shapelib, libmapscript-perl, - php5-mapscript, python-mapscript, ruby-mapscript Description: MapServer utilities @@ -157,7 +153,6 @@ Depends: ${misc:Depends} Suggests: cgi-mapserver, libmapscript-perl, - php5-mapscript, python-mapscript, ruby-mapscript Description: documentation for MapServer @@ -168,19 +163,6 @@ functionality in MapScript is provided by the suggested mapscript library packages. -Package: php5-mapscript -Architecture: any -Section: php -Depends: ${shlibs:Depends}, - ${misc:Depends} -Suggests: mapserver-bin, - mapserver-doc -Description: php5-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: libmapscript-perl Architecture: any Section: perl diff -Nru mapserver-7.0.0/debian/php5-mapscript.docs mapserver-7.0.0/debian/php5-mapscript.docs --- mapserver-7.0.0/debian/php5-mapscript.docs 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/php5-mapscript.docs 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -mapscript/php/README diff -Nru mapserver-7.0.0/debian/php5-mapscript.examples mapserver-7.0.0/debian/php5-mapscript.examples --- mapserver-7.0.0/debian/php5-mapscript.examples 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/php5-mapscript.examples 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -mapscript/php/examples/* diff -Nru mapserver-7.0.0/debian/php5-mapscript.install mapserver-7.0.0/debian/php5-mapscript.install --- mapserver-7.0.0/debian/php5-mapscript.install 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/php5-mapscript.install 1969-12-31 16:00:00.000000000 -0800 @@ -1,2 +0,0 @@ -usr/lib/php5/ -etc/php5/mods-available/ diff -Nru mapserver-7.0.0/debian/php5-mapscript.postinst mapserver-7.0.0/debian/php5-mapscript.postinst --- mapserver-7.0.0/debian/php5-mapscript.postinst 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/php5-mapscript.postinst 1969-12-31 16:00:00.000000000 -0800 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -#DEBHELPER# - -if [ "$1" = "configure" ]; then - php5enmod mapscript -fi - -exit 0 diff -Nru mapserver-7.0.0/debian/php5-mapscript.prerm mapserver-7.0.0/debian/php5-mapscript.prerm --- mapserver-7.0.0/debian/php5-mapscript.prerm 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/php5-mapscript.prerm 1969-12-31 16:00:00.000000000 -0800 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -if [ "$1" = "remove" ]; then - php5dismod mapscript -fi - -exit 0 diff -Nru mapserver-7.0.0/debian/rules mapserver-7.0.0/debian/rules --- mapserver-7.0.0/debian/rules 2016-01-26 00:37:24.000000000 -0800 +++ mapserver-7.0.0/debian/rules 2016-02-18 16:43:55.000000000 -0800 @@ -22,7 +22,6 @@ CFLAGS += $(LDFLAGS) RUBYVERSIONS := $(shell dh_ruby --print-supported) -PHP5API := $(shell php-config5 --phpapi) MANPAGES := $(wildcard debian/man/*.*.xml) @@ -83,7 +82,7 @@ override_dh_auto_configure: dh_auto_configure -- $(CMAKE_OPTS) \ -DWITH_PYTHON=1 \ - -DWITH_PHP=1 \ + -DWITH_PHP=0 \ -DWITH_PERL=1 \ -DWITH_RUBY=0 \ -DWITH_JAVA=1 \ @@ -142,20 +141,12 @@ -mkdir -p debian/tmp/usr/lib/cgi-bin install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv - # PHP mapscript - echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars - - -mkdir -p debian/tmp/etc/php5/mods-available/ - install -m644 debian/mapscript.ini debian/tmp/etc/php5/mods-available/ - override_dh_installchangelogs: dh_installchangelogs HISTORY.TXT override_dh_installexamples: dh_installexamples - -chmod a-x $(CURDIR)/debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml - override_dh_install: dh_install --autodest --list-missing