[tomcat7] 01/03: Bumped the required version of Java mentioned in /etc/default/tomcat7

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit ec332dc0698b3f8ae8ddb6e4bd1f69caa56044b2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 26 10:38:28 2014 +0200

    Bumped the required version of Java mentioned in /etc/default/tomcat7
---
 debian/changelog         | 7 +++++++
 debian/defaults.template | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 208d841..df86f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.54-2) UNRELEASED; urgency=medium
+
+  * debian/defaults.template: Bumped the required version of Java mentioned
+    in the comment on the JAVA_HOME variable
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 26 May 2014 10:36:43 +0200
+
 tomcat7 (7.0.54-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/defaults.template b/debian/defaults.template
index c178030..e38f675 100644
--- a/debian/defaults.template
+++ b/debian/defaults.template
@@ -7,8 +7,8 @@ TOMCAT7_USER=tomcat7
 TOMCAT7_GROUP=tomcat7
 
 # The home directory of the Java development kit (JDK). You need at least
-# JDK version 1.5. If JAVA_HOME is not set, some common directories for 
-# OpenJDK, the Sun JDK, and various J2SE 1.5 versions are tried.
+# JDK version 6. If JAVA_HOME is not set, some common directories for
+# OpenJDK, the Oracle JDK, and various Java SE 6+ versions are tried.
 #JAVA_HOME=/usr/lib/jvm/openjdk-6-jdk
 
 # You may pass JVM startup parameters to Java here. If unset, the default

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