[Pkg-mediawiki-commits] [wikidiff2] 01/02: Use dh_php to install the wikidiff2.ini file

[Kunal Mehta]

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

legoktm-guest pushed a commit to branch master
in repository wikidiff2.

commit 73341ce3970080b06c5764e2b110aace72ade9e2
Author: Kunal Mehta <legoktm at member.fsf.org>
Date:   Mon Dec 4 19:15:09 2017 -0800

    Use dh_php to install the wikidiff2.ini file
    
    Instead of hardcoding 7.0, let dh_php take care of figuring out
    the proper place to install to. This should fix using this on
    Ubuntu, which has already transitioned to PHP 7.1.
    
    The ini file will also now be automatically enabled, so users will
    not need to run `phpenmod` by themselves any longer.
---
 debian/changelog         | 3 ++-
 debian/control           | 2 +-
 debian/dirs              | 1 -
 debian/install           | 1 -
 debian/php-wikidiff2.php | 1 +
 debian/rules             | 6 +-----
 debian/tests/control     | 3 +--
 debian/tests/unittests   | 1 -
 8 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f2b62d..cc9ebae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 wikidiff2 (1.5.1-3) UNRELEASED; urgency=medium
 
   * Rules-Requires-Root: no
+  * Use dh_php to install the wikidiff2.ini file
 
- -- Kunal Mehta <legoktm at member.fsf.org>  Fri, 01 Dec 2017 23:47:17 -0800
+ -- Kunal Mehta <legoktm at member.fsf.org>  Mon, 04 Dec 2017 19:59:09 -0800
 
 wikidiff2 (1.5.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c78eeb6..b74d3b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: php
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>, Kunal Mehta <legoktm at member.fsf.org>
-Build-Depends: debhelper (>= 9), php-dev, libthai-dev, pkg-config, php-cli
+Build-Depends: debhelper (>= 9), dh-php, php-dev, libthai-dev, pkg-config, php-cli
 Homepage: http://www.mediawiki.org/wiki/Extension:Wikidiff2
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/wikidiff2.git
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 031cfbe..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/php/7.0/mods-available
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 40d4416..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-wikidiff2.ini 	etc/php/7.0/mods-available
diff --git a/debian/php-wikidiff2.php b/debian/php-wikidiff2.php
new file mode 100644
index 0000000..6200b52
--- /dev/null
+++ b/debian/php-wikidiff2.php
@@ -0,0 +1 @@
+mod wikidiff2.ini
diff --git a/debian/rules b/debian/rules
index 2c8d3f0..aa69963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 CXXFLAGS+=-Wno-write-strings
 
 %:
-	dh $@
+	dh $@ --with php
 
 override_dh_auto_configure:
 	/usr/bin/phpize
@@ -17,10 +17,6 @@ override_dh_auto_test:
 override_dh_auto_install:
 	INSTALL_ROOT=$(CURDIR)/debian/php-wikidiff2 make install
 
-override_dh_gencontrol:
-	echo "php:Depends=phpapi-$(shell php-config --phpapi)" >> debian/php-wikidiff2.substvars
-	dh_gencontrol
-
 override_dh_auto_clean:
 	/usr/bin/phpize --clean
 	dh_auto_clean
diff --git a/debian/tests/control b/debian/tests/control
index 3606419..f89dd03 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,2 @@
 Tests: unittests
-Depends: @, php-cli, php-dev, sudo
-Restrictions: needs-root
+Depends: @, php-cli, php-dev
diff --git a/debian/tests/unittests b/debian/tests/unittests
index 2981a16..666f287 100644
--- a/debian/tests/unittests
+++ b/debian/tests/unittests
@@ -2,6 +2,5 @@
 
 set -e
 
-sudo phpenmod wikidiff2
 phpize
 NO_INTERACTION=1 TEST_PHP_EXECUTABLE=/usr/bin/php php run-tests.php

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wikidiff2.git