From b90e8f96b4ef033918a30d39af8f9749cf9814a7 Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Wed, 13 May 2015 01:06:13 +0200 Subject: [PATCH] debian: allow tomcat7 as optional dependency This closes #247 (cherry picked from commit 7451f13f911e0044d0981046bcde31a18f77db83) Signed-off-by: Rohit Yadav Conflicts: debian/control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 35dcb8010fa..703f2a2dc98 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