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

[René Engelhard]

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

New commits:
commit eaf48d9a7c7ba149d287cba4978a44a174ff8db3
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 11 12:48:06 2010 +0100

    make patches apply on ooo320-m9
    
    * patches/dev300/apply: i107917.diff is in cws dba32k, which is in m9...

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9cde6e0..45b9c64 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -470,6 +470,7 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
 # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
 
+[ Fixes < ooo320-m9 ]
 i107917.diff, i#107917
 
 [ LinuxOnly ]
commit 8012c196bf454c14903e02fb40c9100792319722
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jan 6 18:42:02 2010 +0100

    m9 == rc2

diff --git a/configure.in b/configure.in
index 24489a4..8a7a2d5 100644
--- a/configure.in
+++ b/configure.in
@@ -1478,7 +1478,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_m8" ; then
+elif test "$with_tag" = "OOO320_m9" ; then
    UPSTREAM_VERSION=3.2.0
 fi
 if test -n "$UPSTREAM_VERSION"; then