[ooo-build-commit] Branch 'ooo-build-3-1-1' - distro-configs/OxygenOfficeLinux.conf.in distro-configs/OxygenOfficeWindows.conf.in

[Kalman "" Szalai]

 distro-configs/OxygenOfficeLinux.conf.in   |   21 +++++++++++++++++++--
 distro-configs/OxygenOfficeWindows.conf.in |   18 +++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit 41e423a29d34f165599767a10e2eb52ffa653d1a
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Thu Sep 3 10:36:52 2009 +0200

    Prepare final modifications for final OxygenOffice Professional 3.1.1
    
    * distro-configs/OxygenOfficeLinux.conf.in:
    * distro-configs/OxygenOfficeWindows.conf.in:

diff --git a/distro-configs/OxygenOfficeLinux.conf.in b/distro-configs/OxygenOfficeLinux.conf.in
index a35775e..2c54ee4 100644
--- a/distro-configs/OxygenOfficeLinux.conf.in
+++ b/distro-configs/OxygenOfficeLinux.conf.in
@@ -1,10 +1,11 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 3.1.1 M012 - OxygenOffice Build 0\"
+--with-build-version=\"OxygenOffice Professional 3.1.1 M019 - OxygenOffice Build 25\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
+--enable-mozilla
 --enable-build-mozilla
 --without-system-mozilla
 --with-package-format=\"rpm deb\"
@@ -15,6 +16,7 @@
 --enable-systray
 --with-epm=internal
 --enable-kde
+--enable-kde4
 --enable-gtk
 --enable-evolution2
 --enable-lockdown
@@ -43,5 +45,20 @@
 --with-system-nas
 --with-system-freetype
 --with-jdk-home=/usr/local/jdk1.6.0_14/
-
+--with-dejavu-fonts=2.29
+--with-liberation-fonts=1.1
+--with-gcc-speedup=ccache
+--with-num-cpus=1
+--enable-strip
+--enable-openxml
+--with-java
+--with-drink=\"Hétszőlő Tokaji Aszú wine\"
+--with-split
+--with-tag=ooo310-m19
+--with-extensions
+--with-extension-integration
+--with-sun-templates
+--with-lightproof
+--with-numbertext
+--disable-layout
 
diff --git a/distro-configs/OxygenOfficeWindows.conf.in b/distro-configs/OxygenOfficeWindows.conf.in
index 44b3be5..9725501 100644
--- a/distro-configs/OxygenOfficeWindows.conf.in
+++ b/distro-configs/OxygenOfficeWindows.conf.in
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 3.1.1 M012 - OxygenOffice Build 0\"
+--with-build-version=\"OxygenOffice Professional 3.1.1 M019 - OxygenOffice Build 25\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -23,4 +23,20 @@
 --enable-report-builder
 --disable-cairo
 --with-jdk-home=\"C:\\Program Files\\Java\\jdk1.6.0_14\"
+--with-dejavu-fonts=2.29
+--with-liberation-fonts=1.1
+--with-num-cpus=1
+--enable-strip
+--enable-openxml
+--with-win32
+--with-java
+--with-drink=\"Bock Ermitage wine\"
+--with-split
+--with-tag=ooo310-m19
+--with-extensions
+--with-extension-integration
+--with-sun-templates
+--with-lightproof
+--with-numbertext
+--disable-layout