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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Mar  6 15:58:18 2008
New Revision: 11826
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11826&view=rev

Log:
	* patches/src680/ucb-extra-prerequisites.diff: removed again
	* patches/src680/unittesting-ucb.diff: got the change from
	  ucb-extra-prerequisites.diff added
	* patches/src680/apply: removed ucb-extra-prerequisites.diff,
	  moved novell-win32-odma.diff after unittesting



Removed:
   trunk/patches/src680/ucb-extra-prerequisites.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/unittesting-ucb.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar  6 15:58:18 2008
@@ -1893,13 +1893,6 @@
 # kill >1Mb of bloat in sal
 size-sal-textenc.diff, i#70166
 
-[ NovellOnlyWin32 ]
-SectionOwner => tml
-
-ucb-extra-prerequisites.diff
-novell-win32-odma.diff, i#6885, i#32741
-
-
 [ NovellOnlyUnix ]
 # search also gij32, ..., so the 32-bit package works on 64-bit
 jvmfwk-gij32.diff, n#222708, pmladek
@@ -2074,7 +2067,6 @@
 unittesting-testtools.diff
 unittesting-toolkit.diff
 unittesting-tools.diff
-ucb-extra-prerequisites.diff
 unittesting-ucb.diff
 unittesting-ucbhelper.diff
 unittesting-udkapi.diff
@@ -2101,6 +2093,12 @@
 # disable automatic spellchecking by default
 reduced-disable-auto-spellcheck.diff
 
+[ NovellOnlyWin32 ]
+SectionOwner => tml
+
+novell-win32-odma.diff, i#6885, i#32741
+
+
 [ VOSremoval ]
 
 # remove vos/process.hxx

Modified: trunk/patches/src680/unittesting-ucb.diff
==============================================================================
--- trunk/patches/src680/unittesting-ucb.diff	(original)
+++ trunk/patches/src680/unittesting-ucb.diff	Thu Mar  6 15:58:18 2008
@@ -1,3 +1,11 @@
+--- 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 vcl NULL
++uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl 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
 --- 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 @@