ooo-build r13152 - in branches/ooo-build-2-4-1: . distro-configs patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Fri Jul 11 00:30:29 2008
New Revision: 13152
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13152&view=rev

Log:
        * configure.in:
        * distro-configs/UbuntuEdgy64.conf.in:
        * distro-configs/UbuntuEdgy.conf.in:
        * distro-configs/UbuntuIntrepid64.conf.in:
        * distro-configs/UbuntuIntrepid.conf.in:
        * patches/src680/apply:
          Remove Ubuntu Edgy support and add support for Ubuntu Intrepid.


Added:
   branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid.conf.in
   branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid64.conf.in
Removed:
   branches/ooo-build-2-4-1/distro-configs/UbuntuEdgy.conf.in
   branches/ooo-build-2-4-1/distro-configs/UbuntuEdgy64.conf.in
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/configure.in
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/configure.in
==============================================================================
--- branches/ooo-build-2-4-1/configure.in	(original)
+++ branches/ooo-build-2-4-1/configure.in	Fri Jul 11 00:30:29 2008
@@ -1223,14 +1223,14 @@
 distro-configs/Ubuntu64.conf
 distro-configs/UbuntuDapper.conf
 distro-configs/UbuntuDapper64.conf
-distro-configs/UbuntuEdgy.conf
-distro-configs/UbuntuEdgy64.conf
 distro-configs/UbuntuFeisty.conf
 distro-configs/UbuntuFeisty64.conf
 distro-configs/UbuntuGutsy.conf
 distro-configs/UbuntuGutsy64.conf
 distro-configs/UbuntuHardy.conf
 distro-configs/UbuntuHardy64.conf
+distro-configs/UbuntuIntrepid.conf
+distro-configs/UbuntuIntrepid64.conf
 distro-configs/SUSE.conf
 distro-configs/SUSE-reduced.conf
 distro-configs/SUSE-9.1.conf

Added: branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid.conf.in
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid.conf.in	Fri Jul 11 00:30:29 2008
@@ -0,0 +1,19 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--enable-libsn
+--disable-fontooo
+--with-system-expat
+--with-system-odbc-headers
+--without-nas
+--with-system-curl
+--with-system-sane-header
+--with-system-xrender-headers
+--enable-gnome-vfs
+--enable-pasf
+--with-system-sndfile
+--enable-symbols
+--with-system-db
+--enable-crypt-link
+--enable-pam-link
+--with-dynamic-xinerama
+--enable-xsltproc

Added: branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid64.conf.in
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid64.conf.in	Fri Jul 11 00:30:29 2008
@@ -0,0 +1,19 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--enable-libsn
+--disable-fontooo
+--with-system-expat
+--with-system-odbc-headers
+--without-nas
+--with-system-curl
+--with-system-sane-header
+--with-system-xrender-headers
+--enable-gnome-vfs
+--enable-pasf
+--with-system-sndfile
+--enable-symbols
+--with-system-db
+--enable-crypt-link
+--enable-pam-link
+--with-dynamic-xinerama
+--enable-xsltproc

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Fri Jul 11 00:30:29 2008
@@ -62,14 +62,14 @@
 UbuntuBased : DebianBase, UbuntuOnly
 UbuntuDapper : UbuntuBased, UbuntuDapperOnly, Debian32Only
 UbuntuDapper64 : UbuntuBased, UbuntuDapperOnly
-UbuntuEdgy : UbuntuBased, CairoFonts, UbuntuEdgyOnly, Debian32Only
-UbuntuEdgy64 : UbuntuBased, CairoFonts, UbuntuEdgyOnly
 UbuntuFeisty : UbuntuBased, CairoFonts, UbuntuFeistyOnly, Debian32Only
 UbuntuFeisty64 : UbuntuBased, CairoFonts, UbuntuFeistyOnly
 UbuntuGutsy : UbuntuBased, CairoFonts, UbuntuGutsyOnly, Debian32Only
 UbuntuGutsy64 : UbuntuBased, CairoFonts, UbuntuGutsyOnly
 UbuntuHardy : UbuntuBased, CairoFonts, UbuntuHardyOnly, Debian32Only
 UbuntuHardy64 : UbuntuBased, CairoFonts, UbuntuHardyOnly
+UbuntuIntrepid : UbuntuBased, CairoFonts, UbuntuIntrepidOnly, Debian32Only, Gcc43
+UbuntuIntrepid64 : UbuntuBased, CairoFonts, UbuntuIntrepidOnly, Gcc43
 UbuntuL10n : UbuntuBased, UbuntuL10nOnly, Debian32Only
 # a copy of the UbuntuDapper* lines ("Ubuntu: UbuntuDapper" doesn't work)
 Ubuntu : UbuntuBased, UbuntuDapperOnly,  Debian32Only
@@ -1866,31 +1866,32 @@
 # use -llpsolve55_pic
 system-lpsolve-use-_pic.diff, rengelha
 
-[ UbuntuEdgyOnly ]
+[ UbuntuFeistyOnly ]
 static-libs-use-_pic.diff, rengelha
-hunspell-lib-use-_pic.diff, rengelha
 unxlngi6-notune.diff, doko
 ubuntu-no-stack-protector.diff, doko
 # use -llpsolve55_pic
 system-lpsolve-use-_pic.diff, rengelha
+#gccXXXXX.solenv.javaregistration.diff
 
-[ UbuntuFeistyOnly ]
+[ UbuntuGutsyOnly ]
 static-libs-use-_pic.diff, rengelha
 unxlngi6-notune.diff, doko
 ubuntu-no-stack-protector.diff, doko
-# use -llpsolve55_pic
-system-lpsolve-use-_pic.diff, rengelha
+# link dynamically with liblpsolve55.so
+system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 
-[ UbuntuGutsyOnly ]
+[ UbuntuHardyOnly ]
 static-libs-use-_pic.diff, rengelha
 unxlngi6-notune.diff, doko
 ubuntu-no-stack-protector.diff, doko
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
+ubuntu-mstopdf.diff, ccheney
 
-[ UbuntuHardyOnly ]
+[ UbuntuIntrepidOnly ]
 static-libs-use-_pic.diff, rengelha
 unxlngi6-notune.diff, doko
 ubuntu-no-stack-protector.diff, doko