[ooo-build-commit] .: Branch 'ooo-build-3-2' - configure.in patches/dev300

[René Engelhard]

 configure.in         |    2 +-
 patches/dev300/apply |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5d8382717ab25dd3a4e46484a4f7dbc9268368a2
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Feb 2 00:27:30 2010 +0100

    proactive m12 update
    
    * configure.in: m12==rc5
    * patches/dev300/apply: sw-uno-fix.diff and vcl-drawtransparent-fix.diff are in

diff --git a/configure.in b/configure.in
index 51d4893..238ae6e 100644
--- a/configure.in
+++ b/configure.in
@@ -1503,7 +1503,7 @@ elif test "$with_tag" = "OOO310_m11" ; then
    UPSTREAM_VERSION=3.1.0
 elif test "$with_tag" = "OOO310_m18" ; then
    UPSTREAM_VERSION=3.1.1
-elif test "$with_tag" = "OOO320_m11" ; then
+elif test "$with_tag" = "OOO320_m12" ; then
    UPSTREAM_VERSION=3.2.0
 fi
 if test -n "$UPSTREAM_VERSION"; then
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d5f29cb..8929293 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -623,7 +623,9 @@ unxsplash-bmp-alias.diff, i#60696, jholesov
 [ WriterFixes ]
 # Some WW8 fields weren't imported at all
 sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
+[ WriterFixes < ooo320-m12 ]
 sw-uno-fix.diff, i#108426, cbosdo
+[ WriterFixes ]
 sw-num-fix.diff, n#569266, cbosdo
 
 # Refresh the cell formatting after pasting in it
@@ -3515,6 +3517,8 @@ evaluation-row-limit.diff
 [ Fixes ]
 # TODO: split up into the original patches were this belongs
 valgrind-fixes.diff, thorsten
+
+[ Fixes < ooo320-m12 ]
 vcl-drawtransparent-fix.diff, i#107763, thorsten
 
 [ BuildBits == ooo320-m11 ]