diff -u tomcat5.5-5.5.25/debian/control tomcat5.5-5.5.25/debian/control
--- tomcat5.5-5.5.25/debian/control
+++ tomcat5.5-5.5.25/debian/control
@@ -13,7 +13,7 @@
 
 Package: tomcat5.5
 Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | java2-runtime, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), libecj-java, jsvc (>= 1.0.2~svn20061127-6)
+Depends: java-gcj-compat-dev (>= 1.0.30-5) | java2-sdk, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), libecj-java, jsvc (>= 1.0.2~svn20061127-6)
 Suggests: java-virtual-machine, libapache2-mod-jk, tomcat5.5-webapps (>= ${source:Version}), tomcat5.5-admin (>= ${source:Version})
 Conflicts: tomcat5.5-admin (<= 5.5.20-5)
 Description: Servlet and JSP engine
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-5ubuntu2) hardy; urgency=low
+
+  * debian/control: tomcat5.5 Depends on java2-sdk instead of java2-runtime
+    (LP: #179447).
+  * debian/tomcat5.5.init: Add openjdk-6 to JDK_DIRS (LP: #212521).
+
+ -- Matti Lindell <mlind@cs.joensuu.fi>  Fri, 11 Apr 2008 08:28:17 +0300
+
 tomcat5.5 (5.5.25-5ubuntu1) hardy; urgency=low
 
   * Merge from Debian unstable (LP: #153672, LP: #159661, LP: #161882,
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,7 +48,7 @@
 
 # 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-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-openjdk /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