[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[René Engelhard]

 patches/dev300/apply                            |    1 -
 patches/dev300/mention-java-common-package.diff |   12 ++++++++++++
 patches/dev300/ubuntu-javaldx.diff              |   12 ------------
 3 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit ade47e691533fed678cbd6206272105fe31d592f
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Feb 19 19:40:21 2011 +0100

    fix javaldx' -java-common message
    
    merge ubuntu-javaldx.diff into mention-java-common-package.diff
    and s/openoffice.org/libreoffice/
    diff --git a/patches/dev300/mention-java-common-package.diff b/patches/dev300/mention-java-common-package.diff
    index 597d6eb..766d0a0 100644
    --- a/patches/dev300/mention-java-common-package.diff
    +++ b/patches/dev300/mention-java-common-package.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 354b679..06a2a23 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -521,7 +521,6 @@ gcj-32bit-runtime-path.diff, i#64888, mklose
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
 mention-java-common-package.diff, ccheney
-ubuntu-javaldx.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
diff --git a/patches/dev300/mention-java-common-package.diff b/patches/dev300/mention-java-common-package.diff
index 597d6eb..766d0a0 100644
--- a/patches/dev300/mention-java-common-package.diff
+++ b/patches/dev300/mention-java-common-package.diff
@@ -42,3 +42,15 @@
              nResult = aErrorBox.Execute();
          }
          else
+--- 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,9 @@
+         if (errcode == JFW_E_NO_JAVA_FOUND)
+         {
+             fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n");
++            fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n");
++            fprintf(stderr,"is installed.\n");
++            fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
+             return false;
+         }
+         else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
diff --git a/patches/dev300/ubuntu-javaldx.diff b/patches/dev300/ubuntu-javaldx.diff
deleted file mode 100644
index 52f41ee..0000000
--- a/patches/dev300/ubuntu-javaldx.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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,9 @@
-         if (errcode == JFW_E_NO_JAVA_FOUND)
-         {
-             fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \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;
-         }
-         else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)