diff options
| author | Michal Čihař <michal@cihar.com> | 2016-04-27 06:48:27 (GMT) |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-04-27 06:54:30 (GMT) |
| commit | 80a81e7915ee35cd27f8521a314812f3f38bc9ff (patch) | |
| tree | fdae690a604d6592c9451b042bb8781cac216019 | |
| parent | 35f744de2dc30fc99ee3715f65869c271f662460 (diff) | |
Simplify PHP dependencies, mixed PHP 5/7 setup never really worked, so let's depend on one PHP version only (Closes: #821592).
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index ebb2be9..56afe85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ phpmyadmin (4:4.6.0-2) UNRELEASED; urgency=medium * Do not assume PHP 5 for the upgrade script (Closes: #820881). + * Simplify PHP dependencies, mixed PHP 5/7 setup never really worked, so + let's depend on one PHP version only (Closes: #821592, #820881, #819521). -- Michal Čihař <nijel@debian.org> Wed, 13 Apr 2016 12:58:28 +0200 diff --git a/debian/control b/debian/control index 5459dae..cee8923 100644 --- a/debian/control +++ b/debian/control @@ -13,13 +13,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/phpmyadmin.git Package: phpmyadmin Architecture: all -Depends: libapache2-mod-php7.0 | php7.0-cgi | php7.0-fpm | php7.0 | libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, - php7.0-mysql | php5-mysql | php5-mysqli | php5-mysqlnd, - php7.0-cli | php5-cli, - php7.0-json | php5-json, - php7.0-common | php5-common (>= 5.5.0), - php7.0-mbstring | php7.0-common (<<7.0.3-6) | php5-common, - php7.0-xml | php7.0-common (<<7.0.3-6) | php5-common, +Depends: php, php-mysql, php-cli, php-json, php-mbstring, php-xml, perl, ${misc:Depends}, ${sphinxdoc:Depends}, @@ -28,10 +22,8 @@ Depends: libapache2-mod-php7.0 | php7.0-cgi | php7.0-fpm | php7.0 | libapache2-m php-phpseclib (>= 2.0), ucf (>= 0.28) Recommends: apache2 | lighttpd | httpd, - php7.0-gd | php5-gd, - php7.0-bz2 | php7.0-common (<<7.0.3-7) | php5-common, - php7.0-zip | php7.0-common (<<7.0.3-6) | php5-common, - mysql-client | mariadb-client | virtual-mysql-client, + php-gd, php-bz2, php-zip, + virtual-mysql-client, php-tcpdf Suggests: mysql-server | mariadb-server | virtual-mysql-server, www-browser |