debian: allow tomcat7 as optional dependency This closes #247
(cherry picked from commit 7451f13f911e0044d0981046bcde31a18f77db83) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: debian/control Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b90e8f96 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b90e8f96 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b90e8f96 Branch: refs/heads/master Commit: b90e8f96b4ef033918a30d39af8f9749cf9814a7 Parents: a0cff4c Author: Rene Moser <[email protected]> Authored: Wed May 13 01:06:13 2015 +0200 Committer: Rohit Yadav <[email protected]> Committed: Wed May 13 15:42:46 2015 +0200 ---------------------------------------------------------------------- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b90e8f96/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index 35dcb80..703f2a2 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C Package: cloudstack-management Architecture: all -Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client +Depends: cloudstack-common (= ${source:Version}), tomcat6 | tomcat7 | tomcat8, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser Conflicts: cloud-server, cloud-client, cloud-client-ui Description: CloudStack server library The CloudStack management server
