diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e1be3677..5d1da10e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +v3.5.1 - Feb 25, 2016 +- Fixed PHP package dependency (Trusty) + v3.5.1 - Feb 25, 2016 - Fixed #680 diff --git a/ee/core/variables.py b/ee/core/variables.py index 6a05b67b..a0ca89c6 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -164,11 +164,16 @@ class EEVariables(): # Mail repo and packages ee_mail_repo = ("deb http://http.debian.net/debian-backports {codename}" "-backports main".format(codename=ee_platform_codename)) - - ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d", - "dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve", - "dovecot-managesieved", "postfix-mysql", "php5-cgi", - "php-gettext", "php-pear"] + if ee_platform_codename != 'trusty': + ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d", + "dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve", + "dovecot-managesieved", "postfix-mysql", "php5-cgi", + "php-gettext", "php-pear", "subversion"] + else: + ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d", + "dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve", + "dovecot-managesieved", "postfix-mysql", "php5.6-cgi", + "php-gettext", "php-pear"] # Mailscanner repo and packages ee_mailscanner_repo = ()