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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat Jan 31 21:45:38 2009
New Revision: 15265
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15265&view=rev

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

        * patches/dev300/apply: start with (yet probably not working)
          ooo310-m1 conditionals: cwses npower11 and native220 are in i


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Jan 31 21:45:38 2009
@@ -312,8 +312,11 @@
 #basic runtime fixes
 basic-add-missing-includes-after-cws-npower10.diff
 
+[ CWSBackports < ooo310-m1 ]
 #api changes
 cws-npower11.diff
+
+[ CWSBackports ]
 # GetDialogParent() symbol needs to be exported.
 vba-show-data-form-link-fix.diff, kohei
 
@@ -321,6 +324,7 @@
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+[ CWSBackports < ooo310-m1 ]
 cws-native220.diff, i#98168
 
 [ WPG ]