[libapache-mod-jk] 24/65: Switch to tomcat6 and default-java in workers.properties. Thanks to Olivier Berger. (Closes: #590078)

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libapache-mod-jk.

commit d762fb1bf841bd35ef34c8f41f65500415dcf22a
Author: Torsten Werner <twerner at debian.org>
Date:   Fri Jul 23 23:05:54 2010 +0000

    Switch to tomcat6 and default-java in workers.properties. Thanks to
    Olivier Berger. (Closes: #590078)
---
 debian/changelog          | 4 +++-
 debian/workers.properties | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e29a6ad..a9b1c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
   * Add missing Depends: ${misc:Depends}. 
   * Update Standards-Version: 3.9.0 (no changes).
   * Update patch for config.guess and config.sub.
+  * Switch to tomcat6 and default-java in workers.properties. Thanks to
+    Olivier Berger. (Closes: #590078)
 
- -- Torsten Werner <twerner at debian.org>  Sat, 24 Jul 2010 00:59:29 +0200
+ -- Torsten Werner <twerner at debian.org>  Sat, 24 Jul 2010 01:04:36 +0200
 
 libapache-mod-jk (1:1.2.28-2) unstable; urgency=low
 
diff --git a/debian/workers.properties b/debian/workers.properties
index 74959e3..91ba7f2 100644
--- a/debian/workers.properties
+++ b/debian/workers.properties
@@ -32,13 +32,13 @@
 # installed tomcat. This is where you have your conf, webapps and lib
 # directories.
 #
-workers.tomcat_home=/usr/share/tomcat5
+workers.tomcat_home=/usr/share/tomcat6
 
 #
 # workers.java_home should point to your Java installation. Normally
 # you should have a bin and lib directories beneath it.
 #
-workers.java_home=/usr/lib/jvm/java-gcj
+workers.java_home=/usr/lib/jvm/default-java
 
 #
 # You should configure your environment slash... ps=\ on NT and / on UNIX

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git