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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Mar  6 14:00:42 2008
New Revision: 11823
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11823&view=rev

Log:
	* patches/src680/ucb-added-prerequisites.diff: extracted common
	  change from novell-win32-odma.diff and unittesting-ucb.diff into
	  stand-alone patch



Added:
   trunk/patches/src680/ucb-extra-prerequisites.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/novell-win32-odma.diff
   trunk/patches/src680/unittesting-ucb.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar  6 14:00:42 2008
@@ -1896,6 +1896,7 @@
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 
+ucb-extra-prerequisites.diff
 novell-win32-odma.diff, i#6885, i#32741
 
 
@@ -2073,7 +2074,8 @@
 unittesting-testtools.diff
 unittesting-toolkit.diff
 unittesting-tools.diff
-#unittesting-ucb.diff - FIXME does not apply with novell-win32-odma.diff
+ucb-extra-prerequisites.diff
+unittesting-ucb.diff
 unittesting-ucbhelper.diff
 unittesting-udkapi.diff
 unittesting-vcl.diff

Modified: trunk/patches/src680/novell-win32-odma.diff
==============================================================================
--- trunk/patches/src680/novell-win32-odma.diff	(original)
+++ trunk/patches/src680/novell-win32-odma.diff	Thu Mar  6 14:00:42 2008
@@ -1,11 +1,5 @@
 --- ucb/prj/build.lst	18 Oct 2005 08:45:24 -0000	1.20
 +++ ucb/prj/build.lst	13 Mar 2006 10:55:34 -0000
-@@ -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 tools 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
 @@ -14,2 +14,3 @@ uc	ucb\source\ucp\package		nmake	-	all	u
  uc	ucb\source\ucp\tdoc			nmake	-	all	uc_tdoc uc_inc NULL
  uc	ucb\source\ucp\expand		nmake	-	all	uc_expand uc_inc NULL

Added: trunk/patches/src680/ucb-extra-prerequisites.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/ucb-extra-prerequisites.diff	Thu Mar  6 14:00:42 2008
@@ -0,0 +1,8 @@
+--- ucb/prj/build.lst	18 Oct 2005 08:45:24 -0000	1.20
++++ ucb/prj/build.lst	13 Mar 2006 10:55:34 -0000
+@@ -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 tools 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

Modified: trunk/patches/src680/unittesting-ucb.diff
==============================================================================
--- trunk/patches/src680/unittesting-ucb.diff	(original)
+++ trunk/patches/src680/unittesting-ucb.diff	Thu Mar  6 14:00:42 2008
@@ -1,11 +1,3 @@
---- ucb/prj/build.lst	2007-06-19 18:10:23.000000000 +0200
-+++ ucb/prj/build.lst	2007-09-07 11:52:29.000000000 +0200
-@@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
-+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools 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
 --- ucb/prj/tests.lst	1970-01-01 01:00:00.000000000 +0100
 +++ ucb/prj/tests.lst	2007-09-07 18:02:58.000000000 +0200
 @@ -0,0 +1,9 @@