[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 1d572948dc94ede4a510324dfadfcc28153b1f14
Author: tony mancill <tmancill at debian.org>
Date:   Sat Oct 8 22:00:19 2011 -0700

    set distribution to unstable; add default-java to init script

diff --git a/debian/changelog b/debian/changelog
index aabc3db..c3e8984 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat7 (7.0.22-1) UNRELEASED; urgency=low
+tomcat7 (7.0.22-1) unstable; urgency=low
 
   [ Miguel Landaeta ]
   * New upstream release.
@@ -6,8 +6,9 @@ tomcat7 (7.0.22-1) UNRELEASED; urgency=low
 
   [ tony mancill ]
   * Add dependency on JRE to tomcat7-common (Closes: #644340)
+  * Modify init script to look for JVM in /usr/lib/jvm/default-java
 
- -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:48:37 -0700
+ -- tony mancill <tmancill at debian.org>  Sat, 08 Oct 2011 21:58:41 -0700
 
 tomcat7 (7.0.21-1) unstable; urgency=low
 
diff --git a/debian/tomcat7.init b/debian/tomcat7.init
index 4bba0fb..4fb4b9a 100644
--- a/debian/tomcat7.init
+++ b/debian/tomcat7.init
@@ -55,7 +55,7 @@ TOMCAT7_GROUP=tomcat7
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
+JDK_DIRS="/usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do

-- 
tomcat7: Servlet and JSP engine