ooo-build r15493 - in branches/ooo-build-3-0-1: . patches/dev300 src

[ccheney svn gnome org]

Author: ccheney
Date: Fri Mar  6 17:58:36 2009
New Revision: 15493
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15493&view=rev

Log:
2009-03-06  Chris Cheney  <ccheney ubuntu com>

        * patches/dev300/ubuntu-javaldx.diff: Add patch to change javaldx error
        to tell user to install openoffice.org-java-common package.
        * src/Ubuntu.dic: Update Ubuntu dictionary for new Ubuntu releases.


Added:
   branches/ooo-build-3-0-1/patches/dev300/ubuntu-javaldx.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/src/Ubuntu.dic

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Fri Mar  6 17:58:36 2009
@@ -1521,6 +1521,7 @@
 ubuntu-dictionary.diff
 ubuntu-lpi.diff, i#64895, mklose
 ubuntu-sparc-hack.diff, mklose
+ubuntu-javaldx.diff, ccheney
 # do not use the  internal error number Err:529
 sc-string-arg-err529.diff, n#440808, kohei
 

Added: branches/ooo-build-3-0-1/patches/dev300/ubuntu-javaldx.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/ubuntu-javaldx.diff	Fri Mar  6 17:58:36 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)

Modified: branches/ooo-build-3-0-1/src/Ubuntu.dic
==============================================================================
--- branches/ooo-build-3-0-1/src/Ubuntu.dic	(original)
+++ branches/ooo-build-3-0-1/src/Ubuntu.dic	Fri Mar  6 17:58:36 2009
@@ -13,8 +13,18 @@
 Eft
 Fawn
 Feisty
+Gibbon
+Gutsy
+Hardy
 Hedgehog
+Heron
 Hoary
+Ibex
+Intrepid
+Jackalope
+Jaunty
+Karmic
+Koala
 Kubuntu
 Launchpad
 Malone