ooo-build r13423 - in trunk: . distro-configs patches/dev300

[ccheney svn gnome org]

Author: ccheney
Date: Tue Jul 29 02:27:46 2008
New Revision: 13423
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13423&view=rev

Log:
008-07-28  Chris Cheney  <ccheney ubuntu com>

        * 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:
   trunk/distro-configs/UbuntuIntrepid.conf.in
   trunk/distro-configs/UbuntuIntrepid64.conf.in
Removed:
   trunk/distro-configs/UbuntuEdgy.conf.in
   trunk/distro-configs/UbuntuEdgy64.conf.in
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/distro-configs/UbuntuHardy.conf.in
   trunk/distro-configs/UbuntuHardy64.conf.in
   trunk/patches/dev300/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 29 02:27:46 2008
@@ -1269,14 +1269,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

Modified: trunk/distro-configs/UbuntuHardy.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuHardy.conf.in	(original)
+++ trunk/distro-configs/UbuntuHardy.conf.in	Tue Jul 29 02:27:46 2008
@@ -4,16 +4,14 @@
 --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
+--disable-access

Modified: trunk/distro-configs/UbuntuHardy64.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuHardy64.conf.in	(original)
+++ trunk/distro-configs/UbuntuHardy64.conf.in	Tue Jul 29 02:27:46 2008
@@ -4,16 +4,14 @@
 --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
+--disable-access

Added: trunk/distro-configs/UbuntuIntrepid.conf.in
==============================================================================
--- (empty file)
+++ trunk/distro-configs/UbuntuIntrepid.conf.in	Tue Jul 29 02:27:46 2008
@@ -0,0 +1,17 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--enable-libsn
+--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

Added: trunk/distro-configs/UbuntuIntrepid64.conf.in
==============================================================================
--- (empty file)
+++ trunk/distro-configs/UbuntuIntrepid64.conf.in	Tue Jul 29 02:27:46 2008
@@ -0,0 +1,17 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--enable-libsn
+--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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 29 02:27:46 2008
@@ -70,14 +70,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
@@ -1946,31 +1946,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