[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 4c29dc01f039a909eeb8217261f38ee656929523
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 11:48:47 2011 +0300

    Bypass two layout localization patches for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 442855e..8c9693b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1240,9 +1240,15 @@ layout-disabled-layout-build-fix.diff, pmladek
 # really localize the layout dialogs
 # FIXME: generates localize.sdf from the .zip files in solver
 # should replace layout-localize-fix-sc.diff
-layout-generate-localize-sdf.diff, deb#570378, pmladek
+# FIXME 2011-04-05: No makefiles in sc any more, that part needs to be
+# redone for gbuild in some way I guess, commenting out it for
+# now.
+# layout-generate-localize-sdf.diff, deb#570378, pmladek
+
 # zoom dialog was not localized
-layout-generate-localize-sdf-2.diff, bnc#595823, pmladek
+# FIXME 2011-04-05: A follow-up on the previous, so also
+# commented out.
+# layout-generate-localize-sdf-2.diff, bnc#595823, pmladek
 
 
 [ OxygenOfficePalettes ]