[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.40-2-10-gc2b60f1

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit c2b60f1cb0c965a746f2e5f76c35a2b45c637d12
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jul 23 18:08:03 2013 +0200

    Closing bug 714348

diff --git a/debian/changelog b/debian/changelog
index a3afc8a..b51a26b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ tomcat7 (7.0.42-1) unstable; urgency=low
   * Refresh patches.
   * debian/control: changed Vcs-Git and Vcs-Browser fields,
     now they are canonical.
+  * Fixed error message in Tomcat init script,
+    patch by Thijs Kinkhorst (Closes: #714348)
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 16 Jul 2013 17:34:58 +0200
 
diff --git a/debian/tomcat7.init b/debian/tomcat7.init
index 2ea4d9f..eeea1dc 100644
--- a/debian/tomcat7.init
+++ b/debian/tomcat7.init
@@ -184,7 +184,7 @@ catalina_sh() {
 case "$1" in
   start)
 	if [ -z "$JAVA_HOME" ]; then
-		log_failure_msg "no JDK found - please set JAVA_HOME"
+		log_failure_msg "no JDK or JRE found - please set JAVA_HOME"
 		exit 1
 	fi
 

-- 
tomcat7: Servlet and JSP engine