ooo-build r13259 - trunk/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jul 17 00:37:35 2008
New Revision: 13259
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13259&view=rev

Log:
patch apply fixes for beb300, again

Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 17 00:37:35 2008
@@ -250,7 +250,7 @@
 [ TemporaryHacks < dev300-m25 ]
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths-m24.diff, i#90430, jholesov
-[ TemporaryHacks >= dev300-m25 ]
+[ TemporaryHacks >= dev300-m25 < beb300-m0 ]
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
@@ -988,7 +988,7 @@
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
-[ BuildBits >= dev300-m25 ]
+[ BuildBits >= dev300-m25 < beb300-m0 ]
 novell-win32-agfa-monotype-fonts.diff, tml
 [ BuildBits < dev300-m25 ]
 novell-win32-agfa-monotype-fonts-m24.diff, tml
@@ -1154,7 +1154,7 @@
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
 sdk-gid-module-name-m24.diff, pmladek, i#64802
-[ BuildBits >= dev300-m25 ]
+[ BuildBits >= dev300-m25 < beb300-m0 ]
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
 sdk-gid-module-name.diff, pmladek, i#64802
@@ -2253,8 +2253,8 @@
 [ DebianBaseOnly ]
 debian-system-apache-commons.diff
 
-# FIXME: does this need more for DEV300s new external modules?
-[ DebianBaseOnly >= dev300-m25 ]
+# FIXME: needs new stuff for redland
+[ DebianBaseOnly >= dev300-m25 < beb300-m0]
 configures-explicit-arch.diff
 [ DebianBaseOnly < dev300-m25 ]
 configures-explicit-arch-m24.diff
@@ -2486,7 +2486,7 @@
 cairo-prj-build-lst-m21.diff
 cairo-prj-d-lst-m21.diff
 
-[ InternalCairo >= dev300-m22 ]
+[ InternalCairo >= dev300-m22 < beb300-m0 ]
 cairo-prj-build-lst.diff
 cairo-prj-d-lst.diff