[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/ubuntu-javaldx.diff |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e6b6c90651e1cfaecb1aa9c6c8b3b876a78f5fce
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 10 13:43:13 2009 +0200

    clarify error message in ubuntu-javaldx.diff - also mention the JVM itself
    
    * patches/dev300/ubuntu-javaldx.diff: add "a JVM and"

diff --git a/patches/dev300/ubuntu-javaldx.diff b/patches/dev300/ubuntu-javaldx.diff
index 048348c..52f41ee 100644
--- a/patches/dev300/ubuntu-javaldx.diff
+++ b/patches/dev300/ubuntu-javaldx.diff
@@ -1,10 +1,11 @@
 --- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig	2008-04-11 05:19:31.000000000 -0500
 +++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2009-03-05 19:54:38.000000000 -0600
-@@ -111,6 +111,8 @@
+@@ -111,6 +111,9 @@
          if (errcode == JFW_E_NO_JAVA_FOUND)
          {
              fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n");
-+            fprintf(stderr,"Please ensure that the package openoffice.org-java-common is installed.\n");
++            fprintf(stderr,"Please ensure that a JVM and the package openoffice.org-java-common\n");
++            fprintf(stderr,"is installed.\n");
 +            fprintf(stderr,"If it is already installed then try removing ~/.openoffice.org/3/user/config/javasettings_Linux_*.xml\n");
              return false;
          }