diff -u tomcat5.5-5.5.25/debian/tomcat5.5.init tomcat5.5-5.5.25/debian/tomcat5.5.init
--- tomcat5.5-5.5.25/debian/tomcat5.5.init
+++ tomcat5.5-5.5.25/debian/tomcat5.5.init
@@ -48,17 +48,12 @@
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe"
+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 /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
     if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-	JAVA_HOME_TMP="$jdir"
-	# checks for a real JDK like environment, needed to check if 
-	# really the java-gcj-compat-dev package is installed
-	if [ -r "$jdir/bin/jdb" ]; then
-	    JAVA_HOME="$JAVA_HOME_TMP"
-	fi
+	JAVA_HOME="$jdir"
     fi
 done
 export JAVA_HOME
diff -u tomcat5.5-5.5.25/debian/changelog tomcat5.5-5.5.25/debian/changelog
--- tomcat5.5-5.5.25/debian/changelog
+++ tomcat5.5-5.5.25/debian/changelog
@@ -1,3 +1,11 @@
+tomcat5.5 (5.5.25-5ubuntu1.2) hardy-proposed; urgency=low
+
+  * debian/tomcat5.5.init: Add OpenJDK to the JVM list and stop refusing JREs
+    so that Tomcat 5.5 starts up correctly with all the java2-runtime providers
+    in hardy (LP: #179447, LP: #212521)
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Mon, 22 Sep 2008 10:48:30 +0200
+
 tomcat5.5 (5.5.25-5ubuntu1.1) hardy-security; urgency=low
 
   * SECURITY UPDATE: Fix information disclosure vulnerability that allowed to