ooo-build r12449 - in trunk: . bin patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat May  3 21:34:28 2008
New Revision: 12449
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12449&view=rev

Log:
2008-05-03  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/seamonkey-is-iceape-diff: fix build with
          --with-system-mozilla=iceape (DebianOnly)


Added:
   trunk/patches/dev300/seamonkey-is-iceape-diff
Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/patches/dev300/apply

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Sat May  3 21:34:28 2008
@@ -115,9 +115,7 @@
 DATADIR=$OODESTDIR$DATADIRBASE
 SYSCONFBASE= sysconfdir@
 SYSCONFDIR=$OODESTDIR$SYSCONFBASE
-OOINSTBASE= libdir@/@OOOINSTALLDIRNAME@
 OOINSTDIR=$OODESTDIR$OOINSTBASE
-OOOINSTALLDIRNAME= OOOINSTALLDIRNAME@
 UPSTREAM_NAME= UPSTREAM_NAME@
 MONO_GAC_ROOT= MONO_GAC_ROOT@
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat May  3 21:34:28 2008
@@ -849,6 +849,7 @@
 SectionOwner => rengelha
 # fix the splash progressbar colors
 debian-splash.diff
+seamonkey-is-iceape-diff
 
 [ DroplineGNOMEOnly ]
 SectionOwner => DropLine

Added: trunk/patches/dev300/seamonkey-is-iceape-diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/seamonkey-is-iceape-diff	Sat May  3 21:34:28 2008
@@ -0,0 +1,22 @@
+--- configure.in-old	2008-05-03 23:27:00.000000000 +0200
++++ configure.in	2008-05-03 23:27:37.000000000 +0200
+@@ -511,7 +511,7 @@
+                           components cannot be built against a contemporary
+                           mozilla. The flavour used can be specified by
+                           --with-system-mozilla=<flavour>. Supported are:
+-                          libxul (default), xulrunner, firefox, seamonkey,
++                          libxul (default), xulrunner, firefox, iceape,
+                           mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+ AC_ARG_WITH(stlport,
+@@ -4134,8 +4134,8 @@
+       MOZ_FLAVOUR=libxul
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
+       MOZ_FLAVOUR=xulrunner
+-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+-      MOZ_FLAVOUR=seamonkey
++    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "iceape"; then
++      MOZ_FLAVOUR=iceape
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
+       MOZ_FLAVOUR=firefox
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then