ooo-build r15475 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar  5 14:16:56 2009
New Revision: 15475
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15475&view=rev

Log:
2009-03-05  Petr Mladek  <pmladek suse cz>

	* patches/dev300/gnome-vfs-late-init-m2.diff: remove the duplicated hunk
	  ucb/prj/build.lst
	* patches/dev300/apply: really apply redirect-extensions-m3.diff for
	  ooo310-m3 and lower



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/gnome-vfs-late-init-m2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar  5 14:16:56 2009
@@ -386,7 +386,7 @@
 
 [ FixesNotForUpstream <= dev300-m42 <= ooo310-m3 ]
 # re-direct to plugins via http://extensions.go-oo.org/
-redirect-extensions-m0.diff 
+redirect-extensions-m3.diff 
 
 [ FixesNotForUpstream  > dev300-m42 > ooo310-m3 ]
 # re-direct to plugins via http://extensions.go-oo.org/

Modified: trunk/patches/dev300/gnome-vfs-late-init-m2.diff
==============================================================================
--- trunk/patches/dev300/gnome-vfs-late-init-m2.diff	(original)
+++ trunk/patches/dev300/gnome-vfs-late-init-m2.diff	Thu Mar  5 14:16:56 2009
@@ -141,11 +141,3 @@
  
  	uno::Reference< lang::XMultiServiceFactory > xSMgr
  		(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
---- ucb/prj/build.lst.old	2007-11-26 13:43:29.000000000 +0100
-+++ ucb/prj/build.lst	2008-03-06 15:06:44.000000000 +0100
-@@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
-+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
- uc	ucb							usr1	-	all	uc_mkout NULL
- uc	ucb\inc					    nmake	-	all	uc_inc NULL
- uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL