[SCM] tomcat6 packaging branch, master, updated. debian/6.0.33-1-11-gd749c75

[tony mancill]

The following commit has been merged in the master branch:
commit da6aae4e14c7318bbdfa021f39e9c6ec7accec1c
Author: tony mancill <tmancill at debian.org>
Date:   Mon Dec 12 22:36:58 2011 -0800

    make jdk7 patch more generic to handle openjdk-6 installation

diff --git a/debian/changelog b/debian/changelog
index d1aad1a..a86ee14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ tomcat6 (6.0.35-1) UNRELEASED; urgency=low
 
   [ tony mancill ]
   * Update Vcs-* fields in debian/control for switch to git.
-  * Update to run with openjdk-7 packages.  (Closes: #651448)
+  * Update to run with openjdk-7 and openjdk-6 when not default-jdk is
+    not present. (Closes: #651448)
   * Allow java?-runtime-headless to satisfy Depends.
   * Add myself to Uploaders.
 
diff --git a/debian/tomcat6.init b/debian/tomcat6.init
index cf11e36..c5bb175 100644
--- a/debian/tomcat6.init
+++ b/debian/tomcat6.init
@@ -51,16 +51,23 @@ fi
 TOMCAT6_USER=tomcat6
 TOMCAT6_GROUP=tomcat6
 
-# this is an ugly work-around until there is a suitable runtime replacement 
+# this is a work-around until there is a suitable runtime replacement 
 # for dpkg-architecture for arch:all packages
-# this function sets the variable JDK7_HOME
-find_jdk7()
+# this function sets the variable OPENJDKS
+find_openjdks()
 {
         for jvmdir in /usr/lib/jvm/java-7-openjdk-*
         do
                 if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-7-openjdk-common" ]
                 then
-                        JDK7_HOME=$jvmdir
+                        OPENJDKS=$jvmdir
+                fi
+        done
+        for jvmdir in /usr/lib/jvm/java-6-openjdk-*
+        do
+                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-6-openjdk-common" ]
+                then
+                        OPENJDKS="${OPENJDKS} ${jvmdir}"
                 fi
         done
 }
@@ -68,9 +75,9 @@ find_jdk7()
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
 
-JDK7_HOME=""
-find_jdk7
-JDK_DIRS="/usr/lib/jvm/default-java $JDK7_HOME /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"
+OPENJDKS=""
+find_openjdks
+JDK_DIRS="/usr/lib/jvm/default-java ${OPENJDKS} /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

-- 
tomcat6 packaging