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

[René Engelhard]

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

New commits:
commit 9f6ab4508aa84ed3a16ee35abcdc7bed09091eee
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jan 22 16:35:48 2010 +0100

    prospective m11 update
    
    * configure.in: m11=rc4
    * patches/dev300/apply: helpcontent2-auxiliary-eu.diff is in m11

diff --git a/configure.in b/configure.in
index 3ca65e2..05f0f41 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_m10" ; then
+elif test "$with_tag" = "OOO320_m11" ; then
    UPSTREAM_VERSION=3.2.0
 fi
 if test -n "$UPSTREAM_VERSION"; then
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e3e1fdb..a9c1b32 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -446,9 +446,12 @@ automation-testtool-oobuildfix.diff, n#145906, noelpwer
 # fixes some .cfg files in helpcontent2/source/auxiliary to use right
 # lang code instead of en-US..
 helpcontent2-auxiliary-cfg.diff, pmladek
+
+[ Fixes < ooo320-m11 ]
 # .. and add eu
 helpcontent2-auxiliary-eu.diff, i#108534
 
+[ Fixes ]
 # more secure permissions for the user directory by default
 desktop-safer-user-dir-perm.diff, i#62858, pmladek