CVS tomcat5/debian

[Wolfgang B??r]

Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv3715/debian

Modified Files:
	changelog control tomcat5.init 
Log Message:
Update CVS to latest revision.
  * Correct description to refer to tomcat5-webapps (closes: #336984)
  * Test in tomcat5.init for JDK like environment so we are sure
    java-gcj-compat-dev is installed and used (closes: #337270)


--- /cvsroot/pkg-java/tomcat5/debian/changelog	2005/10/24 19:43:05	1.7
+++ /cvsroot/pkg-java/tomcat5/debian/changelog	2006/01/05 12:08:55	1.8
@@ -1,3 +1,11 @@
+tomcat5 (5.0.30-8) unstable; urgency=low
+
+  * Correct description to refer to tomcat5-webapps (closes: #336984)
+  * Test in tomcat5.init for JDK like environment so we are sure
+    java-gcj-compat-dev is installed and used (closes: #337270)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Mon,  7 Nov 2005 19:17:58 +0100
+
 tomcat5 (5.0.30-7) unstable; urgency=low
 
   * Move to main - upload with orig.tar.gz included
--- /cvsroot/pkg-java/tomcat5/debian/control	2005/10/24 19:43:05	1.8
+++ /cvsroot/pkg-java/tomcat5/debian/control	2006/01/05 12:08:55	1.9
@@ -16,7 +16,7 @@
  .
  This package just contains the startup scripts for Tomcat 5. No documentation
  or web applications (webapps) are included here, please install the
- tomcat4-webapps package if you want them.
+ tomcat5-webapps package if you want them.
  .
  For more information about Tomcat please take a look at the Tomcat
  home page at http://jakarta.apache.org/tomcat/index.html.
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.init	2005/10/24 19:43:05	1.6
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.init	2006/01/05 12:08:55	1.7
@@ -54,7 +54,12 @@
 # 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="$jdir"
+		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
 	fi
 done
 export JAVA_HOME