From d0be0a33b7c777c8fa567371610469dd65fdc45c Mon Sep 17 00:00:00 2001 From: Colan Schwartz Date: Thu, 28 Apr 2016 17:16:27 -0400 Subject: [PATCH] Issue #2715599 by colan: Accept php7 Debian packages as well as php5. --- debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index f27e144..a963047 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-browser: http://drupalcode.org/project/provision.git Package: aegir3-provision Architecture: all -Depends: ${misc:Depends}, php5-cli (>= 5.3), php5-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl +Depends: ${misc:Depends}, php5-cli (>= 5.3) | php7.0-cli, php5-mysql | php7.0-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl Recommends: mysql-server | mariadb-server, rsync Conflicts: aegir-provision, aegir-provision2, aegir2-provision Replaces: aegir-provision, aegir-provision2, aegir2-provision @@ -30,9 +30,9 @@ Description: mass Drupal hosting system - backend Package: aegir3-hostmaster Architecture: all -Depends: ${misc:Depends}, php5-mysql, php5-gd, apache2 | nginx, libapache2-mod-php5 | php5-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6) +Depends: ${misc:Depends}, php5-mysql | php7.0-mysql, php5-gd | php7.0-gd, apache2 | nginx, libapache2-mod-php5 | libapache2-mod-php7.0 | php5-fpm | php7.0-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6) Build-Depends: dh-systemd -Recommends: php5 +Recommends: php5 | php7.0 Conflicts: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster Replaces: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster Description: mass Drupal hosting system - frontend @@ -69,8 +69,8 @@ Description: mass Drupal hosting system Package: aegir3-cluster-slave Architecture: all -Depends: ${misc:Depends}, php5-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5, rsync, nfs-client, mysql-client -Recommends: php5-gd, php5 +Depends: ${misc:Depends}, php5-mysql | php7.0-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0, rsync, nfs-client, mysql-client +Recommends: php5-gd | php7.0-gd, php5 | php7.0 Conflicts: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave, aegir3 Replaces: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave Description: web frontend for the Aegir hosting system -- 2.5.0