ooo-build r15473 - in trunk: . patches/dev300 patches/unittesting

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Mar  5 13:46:58 2009
New Revision: 15473
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15473&view=rev

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

        * patches/dev300/gnome-vfs-late-init-m2.diff,
          patches/dev300/gnome-vfs-late-init.diff: fix applying
        * patches/unittesting/unittesting-ucb.diff: adapt for above



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

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 13:46:58 2009
@@ -35,14 +35,14 @@
                  }
              }
          } catch (RuntimeException e) {
---- ucb/prj/build.lst-old	2009-03-05 01:42:06.000000000 +0100
-+++ ucb/prj/build.lst	2009-03-05 01:42:13.000000000 +0100
+--- ucb/prj/build.lst-old       2009-03-05 14:42:20.000000000 +0100
++++ ucb/prj/build.lst   2009-03-05 14:42:26.000000000 +0100
 @@ -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
+-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
 diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk
 index b071745..074a9fa 100644
 --- ucb/source/ucp/gvfs/makefile.mk

Modified: trunk/patches/dev300/gnome-vfs-late-init.diff
==============================================================================
--- trunk/patches/dev300/gnome-vfs-late-init.diff	(original)
+++ trunk/patches/dev300/gnome-vfs-late-init.diff	Thu Mar  5 13:46:58 2009
@@ -42,11 +42,11 @@
              }
          } catch (RuntimeException e) {
          }
---- ucb/prj/build.lst-old	2009-03-05 01:42:06.000000000 +0100
-+++ ucb/prj/build.lst	2009-03-05 01:42:13.000000000 +0100
+--- ucb/prj/build.lst-old	2009-03-05 14:42:20.000000000 +0100
++++ ucb/prj/build.lst	2009-03-05 14:42:26.000000000 +0100
 @@ -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 : 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

Modified: trunk/patches/unittesting/unittesting-ucb.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-ucb.diff	(original)
+++ trunk/patches/unittesting/unittesting-ucb.diff	Thu Mar  5 13:46:58 2009
@@ -3,8 +3,8 @@
 --- ucb/prj/build.lst
 +++ ucb/prj/build.lst
 @@ -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 : 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