[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.21-1-8-g194cad6

[tony mancill]

The following commit has been merged in the master branch:
commit 832a441ae81ed885028fae66a6d17c858afe5ee5
Author: tony mancill <tmancill at debian.org>
Date:   Sat Oct 8 21:09:01 2011 -0700

    add dependency on JRE

diff --git a/debian/changelog b/debian/changelog
index e5c974e..e0b1dd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 tomcat7 (7.0.22-1) UNRELEASED; urgency=low
 
+  [ Miguel Landaeta ]
   * New upstream release.
   * Fix lintian warning about format specification of copyright file.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Tue, 04 Oct 2011 18:40:11 -0430
+  [ tony mancill ]
+  * Add dependency on JRE to tomcat7-common (Closes: #644340)
+
+ -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:07:40 -0700
 
 tomcat7 (7.0.21-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fc77d5b..f621962 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Homepage: http://tomcat.apache.org
 
 Package: tomcat7-common
 Architecture: all
-Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends}
+Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
+ default-jre-headless | java-5-runtime | java-6-runtime | java-7-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