[mapserver] 01/04: Disable PHP mapscript, extension doesn't support PHP 7 yet.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Mar 25 19:31:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapserver.
commit ba906dff4f5a81d5c1dcdb9c0343d4ee3a23026c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 20 19:41:51 2016 +0100
Disable PHP mapscript, extension doesn't support PHP 7 yet.
---
debian/changelog | 6 ++++
debian/control | 39 +++++++++++-----------
debian/{php5-mapscript.docs => php-mapscript.docs} | 0
...5-mapscript.examples => php-mapscript.examples} | 0
debian/php-mapscript.install | 2 ++
debian/php-mapscript.php | 1 +
...5-mapscript.postinst => php-mapscript.postinst} | 4 ---
debian/php-mapscript.postrm | 7 ++++
debian/php-mapscript.prerm | 7 ++++
debian/php5-mapscript.install | 2 --
debian/php5-mapscript.prerm | 11 ------
debian/rules | 13 ++++----
12 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2ccaf7b..f3246e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (7.0.1-3) UNRELEASED; urgency=medium
+
+ * Disable PHP mapscript, extension doesn't support PHP 7 yet.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 20 Mar 2016 19:41:17 +0100
+
mapserver (7.0.1-2) unstable; urgency=medium
* Update symbols for alpha, hppa, sparc64 & x32.
diff --git a/debian/control b/debian/control
index f1aa440..d1cc2c2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Section: devel
Priority: optional
Build-Depends: debhelper (>= 9),
+# dh-php,
dpkg-dev (>= 1.16.1.1),
cmake (>= 2.8.12.1-1.2),
chrpath,
@@ -29,7 +30,7 @@ Build-Depends: debhelper (>= 9),
libxml2-dev,
libxslt1-dev,
zlib1g-dev (>= 1.1.4),
- php5-dev,
+# php-dev,
pkg-config,
pkg-kde-tools,
python-all (>= 2.6.6-3~),
@@ -58,7 +59,7 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
- php5-mapscript,
+# php-mapscript,
python-mapscript,
ruby-mapscript
Pre-Depends: ${misc:Pre-Depends}
@@ -95,7 +96,7 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
- php5-mapscript,
+# php-mapscript,
python-mapscript,
ruby-mapscript
Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
@@ -118,7 +119,7 @@ Depends: ${shlibs:Depends},
Suggests: mapserver-bin,
mapserver-doc,
libmapscript-perl,
- php5-mapscript,
+# php-mapscript,
python-mapscript,
ruby-mapscript
Description: CGI executable for MapServer
@@ -140,7 +141,7 @@ Suggests: cgi-mapserver,
mapserver-doc,
shapelib,
libmapscript-perl,
- php5-mapscript,
+# php-mapscript,
python-mapscript,
ruby-mapscript
Description: MapServer utilities
@@ -157,7 +158,7 @@ Section: doc
Depends: ${misc:Depends}
Suggests: cgi-mapserver,
libmapscript-perl,
- php5-mapscript,
+# php-mapscript,
python-mapscript,
ruby-mapscript
Description: documentation for MapServer
@@ -168,19 +169,19 @@ Description: documentation for MapServer
functionality in MapScript is provided by the suggested mapscript
library packages.
-Package: php5-mapscript
-Architecture: any
-Section: php
-Depends: php5-common,
- ${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: 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: libmapscript-perl
Architecture: any
diff --git a/debian/php5-mapscript.docs b/debian/php-mapscript.docs
similarity index 100%
rename from debian/php5-mapscript.docs
rename to debian/php-mapscript.docs
diff --git a/debian/php5-mapscript.examples b/debian/php-mapscript.examples
similarity index 100%
rename from debian/php5-mapscript.examples
rename to debian/php-mapscript.examples
diff --git a/debian/php-mapscript.install b/debian/php-mapscript.install
new file mode 100644
index 0000000..934e0b0
--- /dev/null
+++ b/debian/php-mapscript.install
@@ -0,0 +1,2 @@
+usr/lib/php/
+etc/php/*/mods-available/
diff --git a/debian/php-mapscript.php b/debian/php-mapscript.php
new file mode 100644
index 0000000..dce27d9
--- /dev/null
+++ b/debian/php-mapscript.php
@@ -0,0 +1 @@
+mod debian/mapscript.ini
diff --git a/debian/php5-mapscript.postinst b/debian/php-mapscript.postinst
similarity index 63%
rename from debian/php5-mapscript.postinst
rename to debian/php-mapscript.postinst
index d25d7de..786d689 100644
--- a/debian/php5-mapscript.postinst
+++ b/debian/php-mapscript.postinst
@@ -7,8 +7,4 @@ set -e
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- php5enmod mapscript
-fi
-
exit 0
diff --git a/debian/php-mapscript.postrm b/debian/php-mapscript.postrm
new file mode 100644
index 0000000..b7ec504
--- /dev/null
+++ b/debian/php-mapscript.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/php-mapscript.prerm b/debian/php-mapscript.prerm
new file mode 100644
index 0000000..b7ec504
--- /dev/null
+++ b/debian/php-mapscript.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+exit 0
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.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..2e886bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ CFLAGS += $(CPPFLAGS)
CFLAGS += $(LDFLAGS)
RUBYVERSIONS := $(shell dh_ruby --print-supported)
-PHP5API := $(shell php-config5 --phpapi)
+#PHPAPI := $(shell php-config --phpapi)
MANPAGES := $(wildcard debian/man/*.*.xml)
@@ -83,7 +83,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,11 +142,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
+ # TODO: Use dh_php for substvars & mapscript.ini installation
# PHP mapscript
- echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
+ #echo 'misc:Depends=phpapi-'$(PHPAPI) >> debian/php-mapscript.substvars
- -mkdir -p debian/tmp/etc/php5/mods-available/
- install -m644 debian/mapscript.ini debian/tmp/etc/php5/mods-available/
+ #-mkdir -p debian/tmp/etc/php/7.0/mods-available/
+ #install -m644 debian/mapscript.ini debian/tmp/etc/php/7.0/mods-available/
override_dh_installchangelogs:
dh_installchangelogs HISTORY.TXT
@@ -154,7 +155,7 @@ override_dh_installchangelogs:
override_dh_installexamples:
dh_installexamples
- -chmod a-x $(CURDIR)/debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
+ #-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
More information about the Pkg-grass-devel
mailing list