[mapserver] 01/03: Imported Debian patch 7.0.0-9ubuntu3

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch ubuntu-xenial
in repository mapserver.

commit 675a7603f280c2e79d857edb245142de02be73f2
Author: Matthias Klose <doko at ubuntu.com>
Date:   Sun Mar 13 21:14:56 2016 +0000

    Imported Debian patch 7.0.0-9ubuntu3
---
 debian/changelog               | 19 +++++++++++++++++++
 debian/control                 | 22 ++--------------------
 debian/php5-mapscript.docs     |  1 -
 debian/php5-mapscript.examples |  1 -
 debian/php5-mapscript.install  |  2 --
 debian/php5-mapscript.postinst | 14 --------------
 debian/php5-mapscript.prerm    | 11 -----------
 debian/rules                   | 11 +----------
 8 files changed, 22 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fc89ee..8a89fc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+mapserver (7.0.0-9ubuntu3) xenial; urgency=medium
+
+  * No-change rebuild for ruby2.3-only support.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 13 Mar 2016 21:14:56 +0000
+
+mapserver (7.0.0-9ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild to add ruby2.3 support.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 13 Mar 2016 12:34:42 +0000
+
+mapserver (7.0.0-9ubuntu1) xenial; urgency=medium
+
+  * Disable php5-mapscript while swig does not support PHP 7.0
+    (LP: #1546823).
+
+ -- Nishanth Aravamudan <nish.aravamudan at canonical.com>  Thu, 18 Feb 2016 16:24:09 -0800
+
 mapserver (7.0.0-9) unstable; urgency=medium
 
   * Update Vcs-Git URL to use HTTPS.
diff --git a/debian/control b/debian/control
index 635ed71..0502069 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: mapserver
-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Alan Boudreault <aboudreault at mapgears.com>,
            Bas Couwenberg <sebastic at debian.org>
@@ -29,7 +30,6 @@ Build-Depends: debhelper (>= 9),
                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 @@ Suggests: cgi-mapserver,
           mapserver-bin,
           mapserver-doc,
           libmapscript-perl,
-          php5-mapscript,
           python-mapscript,
           ruby-mapscript
 Pre-Depends: ${misc:Pre-Depends}
@@ -95,7 +94,6 @@ Suggests: cgi-mapserver,
           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 @@ Depends: ${shlibs:Depends},
 Suggests: mapserver-bin,
           mapserver-doc,
           libmapscript-perl,
-          php5-mapscript,
           python-mapscript,
           ruby-mapscript
 Description: CGI executable for MapServer
@@ -140,7 +137,6 @@ Suggests: cgi-mapserver,
           mapserver-doc,
           shapelib,
           libmapscript-perl,
-          php5-mapscript,
           python-mapscript,
           ruby-mapscript
 Description: MapServer utilities
@@ -157,7 +153,6 @@ Section: doc
 Depends: ${misc:Depends}
 Suggests: cgi-mapserver,
           libmapscript-perl,
-          php5-mapscript,
           python-mapscript,
           ruby-mapscript
 Description: documentation for MapServer
@@ -168,19 +163,6 @@ Description: documentation for MapServer
  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 --git a/debian/php5-mapscript.docs b/debian/php5-mapscript.docs
deleted file mode 100644
index 30d68c0..0000000
--- a/debian/php5-mapscript.docs
+++ /dev/null
@@ -1 +0,0 @@
-mapscript/php/README
diff --git a/debian/php5-mapscript.examples b/debian/php5-mapscript.examples
deleted file mode 100644
index e30f8d7..0000000
--- a/debian/php5-mapscript.examples
+++ /dev/null
@@ -1 +0,0 @@
-mapscript/php/examples/*
diff --git a/debian/php5-mapscript.install b/debian/php5-mapscript.install
deleted file mode 100644
index 69987d2..0000000
--- a/debian/php5-mapscript.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/php5/
-etc/php5/mods-available/
diff --git a/debian/php5-mapscript.postinst b/debian/php5-mapscript.postinst
deleted file mode 100644
index d25d7de..0000000
--- a/debian/php5-mapscript.postinst
+++ /dev/null
@@ -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 --git a/debian/php5-mapscript.prerm b/debian/php5-mapscript.prerm
deleted file mode 100644
index 01192c9..0000000
--- a/debian/php5-mapscript.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" = "remove" ]; then
-	php5dismod mapscript
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 373ed78..9c62c50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ CFLAGS += $(CPPFLAGS)
 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_clean:
 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 @@ override_dh_auto_install:
 	-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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git