[Pkg-owncloud-commits] [php-sabredav] 01/07: Move away from php5

Mathieu Parent sathieu at moszumanska.debian.org
Fri May 6 13:39:31 UTC 2016


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

sathieu pushed a commit to branch 1.8-php5
in repository php-sabredav.

commit fcde4351101966ad31f19c77cf53427824c22651
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Fri May 6 14:36:25 2016 +0200

    Move away from php5
---
 debian/control       | 7 ++++---
 debian/rules         | 2 +-
 debian/tests/control | 2 +-
 debian/tests/phpunit | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 7db0a3a..bbbf5ee 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear at lists.alioth.debian.org>
 Uploaders: David Prévot <taffit at debian.org>
 Build-Depends: debhelper (>= 8.0.0),
                help2man,
+               php-cli,
+               php-curl,
                php-sabre-vobject (>= 2.1.7),
-               php5-cli,
-               php5-curl,
-               php5-sqlite,
+               php-sqlite3,
+               php-xml,
                phpab,
                phpunit,
                pkg-php-tools (>= 1.7~),
diff --git a/debian/rules b/debian/rules
index c50b659..cd8ad32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_clean:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	php5 /usr/bin/phpunit --configuration tests/phpunit.xml
+	/usr/bin/phpunit --configuration tests/phpunit.xml
 else
 	@echo "** tests disabled"
 endif
diff --git a/debian/tests/control b/debian/tests/control
index b0346fc..8fc9f7a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: phpunit
 Restrictions: rw-build-tree
-Depends: @, patch, php5-cli, php5-curl, php5-sqlite, phpunit
+Depends: @, patch, php-cli, php-curl, php-sqlite3, phpunit
diff --git a/debian/tests/phpunit b/debian/tests/phpunit
index bcf9ffe..f3bb96b 100755
--- a/debian/tests/phpunit
+++ b/debian/tests/phpunit
@@ -1,6 +1,6 @@
 #! /bin/sh
 patch -p1 < debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
-php5 /usr/bin/phpunit --configuration tests/phpunit.xml
+/usr/bin/phpunit --configuration tests/phpunit.xml
 exit=$?
 patch -Rp1 < debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
 exit $exit

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



More information about the Pkg-owncloud-commits mailing list