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

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Wed Nov 12 11:48:41 2008
New Revision: 14483
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14483&view=rev

Log:
2008-11-12  Michel Loiseleur  <mloiseleur linagora com>

* patches/dev300/apply: remove buildfix-openjdk-6-no-rhino.diff
from DebianSid, UbuntuIntrepid & MandrivaOnly section, since it's
in generic Fixes section.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Nov 12 11:48:41 2008
@@ -1029,7 +1029,6 @@
 wizards-path.diff, mrl
 mdv-toolbariconstosmall.diff, cabral
 mdv-exceptcxx-include-string.diff, cabral
-buildfix-openjdk-6-no-rhino.diff
 
 [ MandrivaOnlyUnix ]
 
@@ -1967,8 +1966,6 @@
 static-libs-use-_pic.diff, rengelha
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
-# openjdk contains rhino.jar. breaks the build...
-buildfix-openjdk-6-no-rhino.diff
 
 [ UbuntuOnly ]
 # human-icons-add.diff, mklose
@@ -2014,8 +2011,6 @@
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
-# openjdk contains rhino.jar. breaks the build...
-buildfix-openjdk-6-no-rhino.diff
 
 [ FedoraLinuxOnlyFixes ]
 ooo64508.vcl.honourfontconfighinting.diff
@@ -2852,6 +2847,7 @@
 # disable gnome-vfs bits if we are not building with it enabled
 crash-gvfs.diff, i#95689, michael
 
+# openjdk contains rhino.jar. breaks the build...
 buildfix-openjdk-6-no-rhino.diff
 
 # stop font updatess crashing OO.o - to be merged up-stream