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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 21 21:25:43 2009
New Revision: 15123
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15123&view=rev

Log:
2009-01-21  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: extensions-system-java.diff,
          config_office-openjdk-paths.diff, xmlhelp-system-lucene-fix.diff and
          buildfix-openjdk-6-no-rhino.diff are in m40


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 21 21:25:43 2009
@@ -384,11 +384,13 @@
 [ ExtensionFixes ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
-# extensions: fix & unbundle system java
-extensions-system-java.diff, hmth
 # Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
 apache-commons-build-fix-invalid-chars.diff, kami
 
+[ ExtensionFixes < dev300-m40 ]
+# extensions: fix & unbundle system java
+extensions-system-java.diff, hmth
+
 [ FixesNotForUpstream ]
 pdfimport-no-license.diff
 
@@ -1210,7 +1212,7 @@
 # OpenJDK paths for some archs
 config_office-openjdk-paths-m37.diff, i91783
 
-[ BuildBits >= dev300-m38 ]
+[ BuildBits >= dev300-m38 < dev300-m40 ]
 # OpenJDK paths for some archs
 config_office-openjdk-paths.diff, i91783
 
@@ -1488,6 +1490,7 @@
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
 
+[ SystemBits < dev300-m40 ]
 xmlhelp-system-lucene-fix.diff
 
 [ TangoIcons ]
@@ -2962,9 +2965,11 @@
 # and in the Start Menu on Windows
 win32-tooltips.diff, tml
 
+[ Fixes < dev300-m40 ]
 # openjdk contains rhino.jar. breaks the build...
 buildfix-openjdk-6-no-rhino.diff
 
+[ Fixes ]
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff