ooo-build r14884 - in branches/ooo-build-3-0: . patches/dev300

[ccheney svn gnome org]

Author: ccheney
Date: Wed Dec 17 16:52:27 2008
New Revision: 14884
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14884&view=rev

Log:
2008-12-17  Chris Cheney  <ccheney ubuntu com>

        * patches/dev300/apply: added buildfix-openjdk-6-no-rhino.diff
        to Ubuntu Hardy build.


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Dec 17 16:52:27 2008
@@ -1970,6 +1970,8 @@
 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
 
 [ UbuntuIntrepidOnly ]
 static-libs-use-_pic.diff, rengelha