ooo-build r11424 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Jan 28 04:14:02 2008
New Revision: 11424
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11424&view=rev

Log:
update to apply properly

Modified:
   trunk/ChangeLog
   trunk/patches/src680/jvmfwk-gij32.diff

Modified: trunk/patches/src680/jvmfwk-gij32.diff
==============================================================================
--- trunk/patches/src680/jvmfwk-gij32.diff	(original)
+++ trunk/patches/src680/jvmfwk-gij32.diff	Mon Jan 28 04:14:02 2008
@@ -1,6 +1,6 @@
 --- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.old	2006-12-08 22:15:06.000000000 +0100
 +++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-12-08 22:15:34.000000000 +0100
-@@ -53,12 +53,20 @@
+@@ -56,6 +56,14 @@
  char const* const* GnuInfo::getJavaExePaths(int * size)
  {
      static char const * ar[] = {
@@ -14,6 +14,8 @@
 +#endif
          "gij",
          "bin/gij",
+ 	"gij-4.3",
+@@ -64,7 +64,7 @@
  	"gij-4.2",
  	"bin/gij-4.2",
  	"gij-4.1",