debian: allow tomcat7 as optional dependency

This closes #247

(cherry picked from commit 7451f13f91)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	debian/control
This commit is contained in:
Rene Moser 2015-05-13 01:06:13 +02:00 committed by Rohit Yadav
parent a0cff4ca48
commit b90e8f96b4
1 changed files with 1 additions and 1 deletions

2
debian/control vendored
View File

@ -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