The following commit has been merged in the squeeze-security branch:
commit 71b037787a237b5b8a5a2f7ff72dcd0064dab77e
Author: tony mancill <[email protected]>
Date: Mon Jan 30 22:57:51 2012 -0800
revert multiarch JDK search from init script
diff --git a/debian/changelog b/debian/changelog
index 98fed24..b22a251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ tomcat6 (6.0.35-1+squeeze1) stable-security; urgency=high
* Adjust d/control to more closely match squeeze:
- remove tomcat6-extras binary package (would be NEW in squeeze)
- remove JRE from tomcat6-common Depends
+ * Revert multi-arch patch in /etc/init.d/tomcat6.
- -- tony mancill <[email protected]> Thu, 19 Jan 2012 12:16:17 -0800
+ -- tony mancill <[email protected]> Mon, 30 Jan 2012 22:57:08 -0800
tomcat6 (6.0.35-1) unstable; urgency=low
diff --git a/debian/tomcat6.init b/debian/tomcat6.init
index c5bb175..c693cfc 100644
--- a/debian/tomcat6.init
+++ b/debian/tomcat6.init
@@ -51,33 +51,9 @@ fi
TOMCAT6_USER=tomcat6
TOMCAT6_GROUP=tomcat6
-# this is a work-around until there is a suitable runtime replacement
-# for dpkg-architecture for arch:all packages
-# 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
- 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
-}
-
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-
-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"
+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"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do
--
tomcat6 packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
