[mapserver] 07/09: Use dh_php to set ${php:Depends} and install extension.

[Bas Couwenberg]

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

sebastic pushed a commit to branch osgeo/10.5
in repository mapserver.

commit 2d3575cd0e85cc7d31c64d1f442668d1a3db0966
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 16 22:04:41 2017 +0100

    Use dh_php to set ${php:Depends} and install extension.
---
 debian/changelog                |  1 +
 debian/php5.6-mapscript.install |  1 -
 debian/rules                    | 10 +---------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ae3a9f..b996564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (7.0.4-1~xenial1) UNRELEASED; urgency=medium
   * Update branch in gbp.conf & Vcs-Git URL.
   * Fix substvars for php5.6-mapscript package.
   * Add patch to use include paths from php-config.
+  * Use dh_php to set ${php:Depends} and install extension.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 16 Jan 2017 20:43:54 +0100
 
diff --git a/debian/php5.6-mapscript.install b/debian/php5.6-mapscript.install
index 934e0b0..416b4c7 100644
--- a/debian/php5.6-mapscript.install
+++ b/debian/php5.6-mapscript.install
@@ -1,2 +1 @@
 usr/lib/php/
-etc/php/*/mods-available/
diff --git a/debian/rules b/debian/rules
index d2a6acb..1bd23b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ CFLAGS += $(CPPFLAGS)
 CFLAGS += $(LDFLAGS)
 
 RUBYVERSIONS := $(shell dh_ruby --print-supported)
-PHP5API      := $(shell php-config5.6 --phpapi)
 
 MANPAGES := $(wildcard debian/man/*.*.xml)
 
@@ -68,7 +67,7 @@ CMAKE_OPTS := \
 		-DWITH_PIXMAN=0
 
 %:
-	dh $@ --with python2,pkgkde_symbolshelper \
+	dh $@ --with php,python2,pkgkde_symbolshelper \
 	      --parallel \
 	      --buildsystem cmake
 
@@ -141,13 +140,6 @@ 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.6-mapscript.substvars
-
-	-mkdir -p debian/tmp/etc/php/5.6/mods-available/
-	install -m644 debian/mapscript.ini debian/tmp/etc/php/5.6/mods-available/
-
 override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.TXT
 

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