[Pkg-mediawiki-commits] [wikidiff2] 01/01: Revert "Port to dh-php based packaging"

[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 7bb31eea963fc81f9013468d4c0cc973cea149b9
Author: Kunal Mehta <legoktm at member.fsf.org>
Date:   Sun Sep 10 23:27:51 2017 -0700

    Revert "Port to dh-php based packaging"
    
    This reverts commit ab3d6574e7712a581c465534ca9ff13b7b05be80.
---
 debian/changelog         |  7 -------
 debian/control           |  2 +-
 debian/php-wikidiff2.php |  1 -
 debian/rules             | 31 ++++++++++++++-----------------
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 54e5b88..2e78b93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-wikidiff2 (1.4.1-2) UNRELEASED; urgency=medium
-
-  * gbp: Add sign-tags = True
-  * Port to dh-php based packaging
-
- -- Kunal Mehta <legoktm at member.fsf.org>  Fri, 30 Dec 2016 01:47:31 -0800
-
 wikidiff2 (1.4.1-1) unstable; urgency=medium
 
   * Add watch file
diff --git a/debian/control b/debian/control
index 6ea82d6..6979a13 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, dh-php
+Build-Depends: debhelper (>= 9), php-dev, libthai-dev, pkg-config, php-cli
 Homepage: http://www.mediawiki.org/wiki/Extension:Wikidiff2
 Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/collab-maint/wikidiff2.git
diff --git a/debian/php-wikidiff2.php b/debian/php-wikidiff2.php
deleted file mode 100644
index 6200b52..0000000
--- a/debian/php-wikidiff2.php
+++ /dev/null
@@ -1 +0,0 @@
-mod wikidiff2.ini
diff --git a/debian/rules b/debian/rules
index 3fcce08..2c8d3f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,26 +4,23 @@
 # warning a lot.
 CXXFLAGS+=-Wno-write-strings
 
-PECL_NAME_OVERRIDE := wikidiff2
-DH_PHP_VERSIONS_OVERRIDE := $(shell /usr/sbin/phpquery -V)
-include /usr/share/dh-php/pkg-pecl.mk
+%:
+	dh $@
 
-DIR_TARGETS = $(addprefix build-,$(DH_PHP_VERSIONS))
-
-$(warning CONFIGURE_TARGETS: $(CONFIGURE_TARGETS))
-$(warning BUILD_TARGETS: $(BUILD_TARGETS))
-$(warning INSTALL_TARGETS: $(INSTALL_TARGETS))
-
-PECL_SOURCE=$(filter-out debian build.xml $(DIR_TARGETS),$(wildcard *))
-$(foreach ver,$(DH_PHP_VERSIONS),$(eval PECL_SOURCE_$(ver) := $(PECL_SOURCE)))
-$(foreach ver,$(DH_PHP_VERSIONS),$(mkdir build-$(ver)))
-
-override_dh_testdir: $(DIR_TARGETS)
-	dh_testdir
+override_dh_auto_configure:
+	/usr/bin/phpize
+	dh_auto_configure
 
 override_dh_auto_test:
 	NO_INTERACTION=1 make test
 
-build-%:
-	mkdir -p build-$(*)
+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

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