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

[mklose svn gnome org]

Author: mklose
Date: Sun Nov 23 17:53:12 2008
New Revision: 14578
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14578&view=rev

Log:
2008-11-23  Matthias Klose <doko ubuntu com>

        * configure.in, patches/src680/apply: Add support for Ubuntu 9.04
        (Jaunty Jackalope).
        * distro-configs/UbuntuJaunty{,64}.conf.in: New.


Added:
   branches/ooo-build-2-4-1/distro-configs/UbuntuJaunty.conf.in   (props changed)
      - copied unchanged from r14576, /branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid.conf.in
   branches/ooo-build-2-4-1/distro-configs/UbuntuJaunty64.conf.in   (props changed)
      - copied unchanged from r14576, /branches/ooo-build-2-4-1/distro-configs/UbuntuIntrepid64.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	Sun Nov 23 17:53:12 2008
@@ -1231,6 +1231,8 @@
 distro-configs/UbuntuHardy64.conf
 distro-configs/UbuntuIntrepid.conf
 distro-configs/UbuntuIntrepid64.conf
+distro-configs/UbuntuJaunty.conf
+distro-configs/UbuntuJaunty64.conf
 distro-configs/SUSE.conf
 distro-configs/SUSE-reduced.conf
 distro-configs/SUSE-9.1.conf

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	Sun Nov 23 17:53:12 2008
@@ -68,6 +68,8 @@
 UbuntuHardy64 : UbuntuBased, CairoFonts, UbuntuHardyOnly
 UbuntuIntrepid : UbuntuBased, CairoFonts, UbuntuIntrepidOnly, Debian32Only, Gcc43
 UbuntuIntrepid64 : UbuntuBased, CairoFonts, UbuntuIntrepidOnly, Gcc43
+UbuntuJaunty : UbuntuBased, CairoFonts, UbuntuJauntyOnly, Debian32Only, Gcc43
+UbuntuJaunty64 : UbuntuBased, CairoFonts, UbuntuJauntyOnly, Gcc43
 UbuntuL10n : UbuntuBased, UbuntuL10nOnly, Debian32Only
 # a copy of the UbuntuDapper* lines ("Ubuntu: UbuntuDapper" doesn't work)
 Ubuntu : UbuntuBased, UbuntuDapperOnly,  Debian32Only
@@ -1948,6 +1950,15 @@
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
 
+[ UbuntuJauntyOnly ]
+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
+
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff