[mapserver] 02/03: Revert "Disable PHP mapscript, extension doesn't support PHP 7 yet."
Bas Couwenberg
sebastic at debian.org
Thu Sep 29 17:28:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository mapserver.
commit 07e9dbee170225be41bff39b77340d48f734156b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Sep 29 19:02:37 2016 +0200
Revert "Disable PHP mapscript, extension doesn't support PHP 7 yet."
This reverts commit ba906dff4f5a81d5c1dcdb9c0343d4ee3a23026c.
Conflicts:
debian/changelog
---
debian/control | 39 +++++++++++-----------
debian/php-mapscript.install | 2 --
debian/php-mapscript.php | 1 -
debian/php-mapscript.postrm | 7 ----
debian/php-mapscript.prerm | 7 ----
debian/{php-mapscript.docs => php5-mapscript.docs} | 0
...-mapscript.examples => php5-mapscript.examples} | 0
debian/php5-mapscript.install | 2 ++
...-mapscript.postinst => php5-mapscript.postinst} | 4 +++
debian/php5-mapscript.prerm | 11 ++++++
debian/rules | 13 ++++----
11 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/debian/control b/debian/control
index 8222b55..26ba737 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ 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,
@@ -30,7 +29,7 @@ Build-Depends: debhelper (>= 9),
libxml2-dev,
libxslt1-dev,
zlib1g-dev (>= 1.1.4),
-# php-dev,
+ php5-dev,
pkg-config,
pkg-kde-tools,
python-all (>= 2.6.6-3~),
@@ -59,7 +58,7 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
-# php-mapscript,
+ php5-mapscript,
python-mapscript,
ruby-mapscript
Pre-Depends: ${misc:Pre-Depends}
@@ -96,7 +95,7 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
-# php-mapscript,
+ php5-mapscript,
python-mapscript,
ruby-mapscript
Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
@@ -119,7 +118,7 @@ Depends: ${shlibs:Depends},
Suggests: mapserver-bin,
mapserver-doc,
libmapscript-perl,
-# php-mapscript,
+ php5-mapscript,
python-mapscript,
ruby-mapscript
Description: CGI executable for MapServer
@@ -141,7 +140,7 @@ Suggests: cgi-mapserver,
mapserver-doc,
shapelib,
libmapscript-perl,
-# php-mapscript,
+ php5-mapscript,
python-mapscript,
ruby-mapscript
Description: MapServer utilities
@@ -158,7 +157,7 @@ Section: doc
Depends: ${misc:Depends}
Suggests: cgi-mapserver,
libmapscript-perl,
-# php-mapscript,
+ php5-mapscript,
python-mapscript,
ruby-mapscript
Description: documentation for MapServer
@@ -169,19 +168,19 @@ 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: 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: libmapscript-perl
Architecture: any
diff --git a/debian/php-mapscript.install b/debian/php-mapscript.install
deleted file mode 100644
index 934e0b0..0000000
--- a/debian/php-mapscript.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/php/
-etc/php/*/mods-available/
diff --git a/debian/php-mapscript.php b/debian/php-mapscript.php
deleted file mode 100644
index dce27d9..0000000
--- a/debian/php-mapscript.php
+++ /dev/null
@@ -1 +0,0 @@
-mod debian/mapscript.ini
diff --git a/debian/php-mapscript.postrm b/debian/php-mapscript.postrm
deleted file mode 100644
index b7ec504..0000000
--- a/debian/php-mapscript.postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/php-mapscript.prerm b/debian/php-mapscript.prerm
deleted file mode 100644
index b7ec504..0000000
--- a/debian/php-mapscript.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/php-mapscript.docs b/debian/php5-mapscript.docs
similarity index 100%
rename from debian/php-mapscript.docs
rename to debian/php5-mapscript.docs
diff --git a/debian/php-mapscript.examples b/debian/php5-mapscript.examples
similarity index 100%
rename from debian/php-mapscript.examples
rename to debian/php5-mapscript.examples
diff --git a/debian/php5-mapscript.install b/debian/php5-mapscript.install
new file mode 100644
index 0000000..69987d2
--- /dev/null
+++ b/debian/php5-mapscript.install
@@ -0,0 +1,2 @@
+usr/lib/php5/
+etc/php5/mods-available/
diff --git a/debian/php-mapscript.postinst b/debian/php5-mapscript.postinst
similarity index 63%
rename from debian/php-mapscript.postinst
rename to debian/php5-mapscript.postinst
index 786d689..d25d7de 100644
--- a/debian/php-mapscript.postinst
+++ b/debian/php5-mapscript.postinst
@@ -7,4 +7,8 @@ set -e
#DEBHELPER#
+if [ "$1" = "configure" ]; then
+ php5enmod mapscript
+fi
+
exit 0
diff --git a/debian/php5-mapscript.prerm b/debian/php5-mapscript.prerm
new file mode 100644
index 0000000..01192c9
--- /dev/null
+++ b/debian/php5-mapscript.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ]; then
+ php5dismod mapscript
+fi
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 2e886bb..373ed78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ CFLAGS += $(CPPFLAGS)
CFLAGS += $(LDFLAGS)
RUBYVERSIONS := $(shell dh_ruby --print-supported)
-#PHPAPI := $(shell php-config --phpapi)
+PHP5API := $(shell php-config5 --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=0 \
+ -DWITH_PHP=1 \
-DWITH_PERL=1 \
-DWITH_RUBY=0 \
-DWITH_JAVA=1 \
@@ -142,12 +142,11 @@ 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-'$(PHPAPI) >> debian/php-mapscript.substvars
+ echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
- #-mkdir -p debian/tmp/etc/php/7.0/mods-available/
- #install -m644 debian/mapscript.ini debian/tmp/etc/php/7.0/mods-available/
+ -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
@@ -155,7 +154,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