[ooo-build-commit] .: configure.in distro-configs/UbuntuMaverick.conf.in patches/dev300 src/Ubuntu.dic

[Chris Cheney]

 configure.in                          |    1 +
 distro-configs/UbuntuMaverick.conf.in |   17 +++++++++++++++++
 patches/dev300/apply                  |    5 +++++
 src/Ubuntu.dic                        |    2 ++
 4 files changed, 25 insertions(+)

New commits:
commit af07286a0bd071abdf456855bc6dbebd78213476
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Thu May 27 10:12:25 2010 -0500

    Patch to add Ubuntu 10.10 (Maverick) support
    
    This patch adds support to build under Ubuntu 10.10 (Maverick).
    
    * configure.in:
      distro-configs/UbuntuMaverick.conf.in:
      patches/dev300/apply:
      src/Ubuntu.dic: Patch to add Ubuntu 10.10 (Maverick) support.

diff --git a/configure.in b/configure.in
index 1538405..698f5ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1691,6 +1691,7 @@ distro-configs/UbuntuHardy.conf
 distro-configs/UbuntuJaunty.conf
 distro-configs/UbuntuKarmic.conf
 distro-configs/UbuntuLucid.conf
+distro-configs/UbuntuMaverick.conf
 distro-configs/SUSE.conf
 distro-configs/SUSE-reduced.conf
 distro-configs/SUSE-9.1.conf
diff --git a/distro-configs/UbuntuMaverick.conf.in b/distro-configs/UbuntuMaverick.conf.in
new file mode 100644
index 0000000..f8941af
--- /dev/null
+++ b/distro-configs/UbuntuMaverick.conf.in
@@ -0,0 +1,17 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--disable-fontooo
+--with-system-expat
+--with-system-odbc-headers
+--with-system-curl
+--with-system-sane-header
+--with-system-xrender-headers
+--enable-gnome-vfs
+--enable-symbols
+--with-system-db
+--enable-crypt-link
+--enable-pam-link
+--with-dynamic-xinerama
+--enable-xsltproc
+--disable-access
+--with-linker-hash-style=both
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5835ffd..eaba1f0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -90,6 +90,7 @@ UbuntuHardy : UbuntuBased, UbuntuHardyOnly, CairoFonts
 UbuntuJaunty : UbuntuBased, UbuntuJauntyOnly, CairoFonts
 UbuntuKarmic : UbuntuBased, UbuntuKarmicOnly, CairoFonts
 UbuntuLucid : UbuntuBased, UbuntuLucidOnly, CairoFonts
+UbuntuMaverick : UbuntuBased, UbuntuMaverickOnly, CairoFonts
 UbuntuL10n : UbuntuBased, UbuntuL10nOnly
 # DroplineGNOME
 DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
@@ -3162,6 +3163,10 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
 ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 
+[ UbuntuMaverickOnly ]
+# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
+ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+
 [ Fixes ]
 # Fix for crash on Windows by Rail Aliev. Root cause unknown.
 svx-fix-fit-to-frame-crash.diff, n#508621, rodo
diff --git a/src/Ubuntu.dic b/src/Ubuntu.dic
index bed7612..7837a28 100644
--- a/src/Ubuntu.dic
+++ b/src/Ubuntu.dic
@@ -30,6 +30,8 @@ Launchpad
 Lucid
 Lynx
 Malone
+Maverick
+Meerkat
 Rosetta
 Soyuz
 Ubuntu