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

[tony mancill]

The following commit has been merged in the master branch:
commit 3d9649e3d1f702b421f5ab0278a559b24989c8db
Author: tony mancill <tmancill at debian.org>
Date:   Sat Oct 8 21:51:54 2011 -0700

    clean up mess I made in defaults/tomcat7

diff --git a/debian/changelog b/debian/changelog
index f7718fc..aabc3db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,8 @@ tomcat7 (7.0.22-1) UNRELEASED; urgency=low
 
   [ tony mancill ]
   * Add dependency on JRE to tomcat7-common (Closes: #644340)
-  * JAVA_HOME is now set to /usr/lib/jvm/default_java in 
-    /etc/default/tomcat7
 
- -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:42:17 -0700
+ -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:48:37 -0700
 
 tomcat7 (7.0.21-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f621962..5b4f593 100644
--- a/debian/control
+++ b/debian/control
@@ -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 | java-7-runtime
+ default-jre-headless | java-5-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
diff --git a/debian/defaults.template b/debian/defaults.template
index 85b0007..5183c08 100644
--- a/debian/defaults.template
+++ b/debian/defaults.template
@@ -9,7 +9,7 @@ TOMCAT7_GROUP=tomcat7
 # The home directory of the Java development kit (JDK). You need at least
 # JDK version 1.5. If JAVA_HOME is not set, some common directories for 
 # OpenJDK, the Sun JDK, and various J2SE 1.5 versions are tried.
-JAVA_HOME=/usr/lib/jvm/default-java
+#JAVA_HOME=/usr/lib/jvm/openjdk-6-jdk
 
 # You may pass JVM startup parameters to Java here. If unset, the default
 # options will be: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC

-- 
tomcat7: Servlet and JSP engine