[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b5388d3cd57c25f5148f7ba847e6f84665d8dfc6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 11 10:07:09 2009 +0300

    Bypass i92372.diff for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 879c833..42abfab 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2875,7 +2875,14 @@ svtools-update-ole.diff, n#411855, thorsten
 pdfimport-lax-restrictions.diff, i#90468, thorsten
 
 [ NovellLikeOnlyWin32 ]
-i92372.diff, i#92372, n#353143, tml
+
+# FIXME: 2009-09-11: Bypass this for now. Interferes with
+# cws-koheidatapilot03-vcl.diff. Test whether still needed, and if
+# yes, will have to split out the interfering part of
+# cws-koheidatapilot03-vcl.diff into separate versions for
+# NovellLikeOnlyWin32 and others. (I am not at all sure enough about
+# this i92372.diff to make it used on all platforms.)
+# i92372.diff, i#92372, n#353143, tml
 
 [ Fixes ]
 #sw-import-TOC.diff ,n#404254, Amelia Wang