[Libreoffice-commits] .: Branch 'libreoffice-3-3' - distro-configs/OxygenOfficeLinux.conf.in distro-configs/OxygenOfficeWindows.conf.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sun Jan 9 05:44:21 PST 2011
distro-configs/OxygenOfficeLinux.conf.in | 4 +++-
distro-configs/OxygenOfficeWindows.conf.in | 4 +++-
patches/dev300/apply | 6 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit b76ce8eb22d57708a013590288d8b9fe0655e89d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Jan 9 14:43:34 2011 +0100
Updates for OxygenOffice configuration
diff --git a/distro-configs/OxygenOfficeLinux.conf.in b/distro-configs/OxygenOfficeLinux.conf.in
index ce2b3ba..1174e69 100644
--- a/distro-configs/OxygenOfficeLinux.conf.in
+++ b/distro-configs/OxygenOfficeLinux.conf.in
@@ -24,14 +24,16 @@
--with-extra-template
--with-extra-sample
--with-extra-font
---with-extra-accessory
--with-lang=\"en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko sl\"
--enable-opengl
--enable-dbus
--enable-gnome-vfs
--enable-mono
+--enable-extensions
+--with-extension-integration
--enable-minimizer
--enable-presenter-console
+--enable-presenter-extra-ui
--enable-pdfimport
--without-system-poppler
--enable-wiki-publisher
diff --git a/distro-configs/OxygenOfficeWindows.conf.in b/distro-configs/OxygenOfficeWindows.conf.in
index 8788c66..56ddee6 100644
--- a/distro-configs/OxygenOfficeWindows.conf.in
+++ b/distro-configs/OxygenOfficeWindows.conf.in
@@ -12,10 +12,12 @@
--with-extra-template
--with-extra-sample
--with-extra-font
---with-extra-accessory
--with-lang=\"hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko sl\"
+--enable-extensions
+--with-extension-integration
--enable-minimizer
--enable-presenter-console
+--enable-presenter-extra-ui
--enable-pdfimport
--enable-wiki-publisher
--enable-ogltrans
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6d6f28f..70f28fd 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -130,11 +130,11 @@ Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
# OxygenOffice Professional
-OxygenOfficeLinuxCommon : Common, FontConfigTemporaryHacks, FedoraLinuxOnlyFixes, LinuxOnly, \
+OxygenOfficeLinuxCommon : Common, Defaults, FontConfigTemporaryHacks, FedoraLinuxOnlyFixes, LinuxOnly, \
msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, AddressBooks, QuickStarter, KDE4,\
Netbook, GlobalNSPluginSupport
-OxygenOfficeMacOSXCommon : Common
-OxygenOfficeWin32Common : Common, Win32Only, CliMonoCommon, CliComponent, NotDebian
+OxygenOfficeMacOSXCommon : Common, Defaults
+OxygenOfficeWin32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebian
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
More information about the Libreoffice-commits
mailing list