← Back to branch summary

~ubuntu-branches/ubuntu/natty/libreoffice-l10n/natty-updates

« back to all changes in this revision

Viewing changes to libreoffice-build/patches/dev300/ubuntu-javaldx.diff

  • Committer: Package Import Robot
  • Author(s): Bjoern Michaelsen
  • Date: 2011-03-24 14:22:36 UTC
  • mfrom: (0.14.1) (0.13.1) (0.12.1) (0.11.1) (0.8.2)
  • Revision ID: package-import@ubuntu.com-20110324142236-zr2t1cz8xgxl67b5
Tags: 1:3.3.2-1ubuntu1
* merged all changes from ubuntu-natty-3.3.1 up to 3.3.2-1ubuntu1
* regenerated control file

Show diffs side-by-side

added added

removed removed

Lines of Context:
libreoffice-build/patches/dev300/ubuntu-javaldx.diff
1
 
--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig       2008-04-11 05:19:31.000000000 -0500
2
 
+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx    2009-03-05 19:54:38.000000000 -0600
3
 
@@ -111,6 +111,9 @@
4
 
         if (errcode == JFW_E_NO_JAVA_FOUND)
5
 
         {
6
 
             fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n");
7
 
+            fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n");
8
 
+            fprintf(stderr,"is installed.\n");
9
 
+            fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
10
 
             return false;
11
 
         }
12
 
         else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)