ooo-build r15558 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Mar 17 23:39:26 2009
New Revision: 15558
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15558&view=rev

Log:
2009-03-18  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/cws-dba31k.diff: backport cws dba31k

        merge from ooo-build-3-0-1:

        * patches/dev300/ubuntu-javaldx.diff: Add patch to change javaldx error
        to tell user to install openoffice.org-java-common package.


Added:
   trunk/patches/dev300/ubuntu-javaldx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar 17 23:39:26 2009
@@ -349,6 +349,8 @@
 # fix SRB: include commons-logging
 cws-rptfix06.diff, i#100249, rengelha
 
+cws-dba31k.diff, i#100219
+
 [ CWSBackports < ooo310-m6 ]
 # fix smoketest for non-epm builds
 cws-smoketest21.diff
@@ -1102,6 +1104,7 @@
 debian-opt.diff
 ubuntu-soffice-config.diff, mklose
 ubuntu-openoffice-java-common.diff, ccheney
+ubuntu-javaldx.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere

Added: trunk/patches/dev300/ubuntu-javaldx.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ubuntu-javaldx.diff	Tue Mar 17 23:39:26 2009
@@ -0,0 +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 @@
+         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,"If it is already installed then try removing ~/.openoffice.org/3/user/config/javasettings_Linux_*.xml\n");
+             return 0;
+         }
+         else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)