[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.23-1-15-g8eed63c

[tony mancill]

The following commit has been merged in the master branch:
commit c2ce9fb8138377b5a3b57d7ceded1a87edf32e3b
Author: tony mancill <tmancill at debian.org>
Date:   Sun Feb 26 22:18:27 2012 -0800

    add java6-runtime-headless | java6-runtime to tomcat7-common Depends (Closes: #660757); remove java-5-runtime (tomcat7 requires Java 1.6

diff --git a/debian/control b/debian/control
index 5b4f593..c8dd5f1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: James Page <james.page at ubuntu.com>,
  Miguel Landaeta <miguel at miguel.cc>, tony mancill <tmancill at debian.org>
 Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
 Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-java/tomcat7.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/tomcat7.git
 Homepage: http://tomcat.apache.org
@@ -14,7 +14,7 @@ Homepage: http://tomcat.apache.org
 Package: tomcat7-common
 Architecture: all
 Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
- default-jre-headless | java-5-runtime | java-6-runtime
+ default-jre-headless | java6-runtime-headless | java6-runtime | java-6-runtime
 Description: Servlet and JSP engine -- common files
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web

-- 
tomcat7: Servlet and JSP engine