ooo-build r12066 - in trunk: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Tue Apr  1 05:23:06 2008
New Revision: 12066
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12066&view=rev

Log:
2008-03-31  Chris Cheney <ccheney ubuntu com>

        * patches/src680/apply:
        * patches/src680/xulrunner-1.9.diff: Correct path in patch.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/xulrunner-1.9.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Apr  1 05:23:06 2008
@@ -1043,7 +1043,7 @@
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
 libxmlsec-system-nss.diff, i#69368, pmladek
 
-#xulrunner-1.9.diff, i#86670
+xulrunner-1.9.diff, i#86670
 
 # allow separate helpcontent build
 #FIXME src680: separate-helpcontent.diff, jholesov

Modified: trunk/patches/src680/xulrunner-1.9.diff
==============================================================================
--- trunk/patches/src680/xulrunner-1.9.diff	(original)
+++ trunk/patches/src680/xulrunner-1.9.diff	Tue Apr  1 05:23:06 2008
@@ -1,5 +1,5 @@
---- configure.in.orig	2008-01-31 05:45:01.000000000 -0600
-+++ configure.in	2008-03-29 14:19:38.000000000 -0500
+--- config_office/configure.in.orig	2008-01-31 05:45:01.000000000 -0600
++++ config_office/configure.in	2008-03-29 14:19:38.000000000 -0500
 @@ -466,7 +466,8 @@
                            components cannot be built against a contemporary
                            mozilla. The flavour used can be specified by