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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Jan 20 23:33:31 2009
New Revision: 15107
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15107&view=rev

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

        * patches/dev300/apply: various mingw patches are in dev300-m40


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 20 23:33:31 2009
@@ -2903,9 +2903,7 @@
 [ Fixes < dev300-m38 ]
 svx-ppt-textstyle-fix.diff, n#443127, thorsten
 
-[ MinGW ]
-SectionOwner => jholesov
-
+[ MinGW < dev300-m40 ]
 # trivial build fixes
 mingw-buildfix-cppunit.diff, i#95190, jholesov
 mingw-buildfix-fpicker.diff, i#95190, jholesov
@@ -2915,28 +2913,31 @@
 mingw-buildfix-sal.diff, i#95190, jholesov
 mingw-buildfix-testshl2.diff, i#95190, jholesov
 
+[ MingGW ]
 # build fix for odma - not up-stream
 mingw-buildfix-odma.diff, jholesov
 
 # more allowed -I's in OOo's cpp [for scp2]
 mingw-cpp-increase-include-limit.diff, i#95193, jholesov
 
+[ MinGW < dev300-m40 ]
 # don't use MS assembler for MinGW
 mingw-avoid-ms-assembler.diff, i#95194, jholesov
 
 # make MinGW in Cygwin actually work
 mingw-do-not-interfere-with-cygwin.diff, i#95198, jholesov
 
+[ MinGW ]
 # sleep using osl::Thread::wait()
 mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
 
+[ MinGW < dev300-m40 ]
 # make it build --without-stlport
 mingw-build-without-stlport-setup_native.diff, i#95203, jholesov
 mingw-build-without-stlport-shell.diff, i#95203, jholesov
 mingw-build-without-stlport-soltools.diff, i#95203, jholesov
 mingw-build-without-stlport-stlport.diff, i#95203, jholesov
 
-
 [ Fixes < dev300-m38 ]
 cws-impressfontsize.diff, i#8824, cl