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

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri May 23 09:00:20 2008
New Revision: 12643
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12643&view=rev

Log:
2008-05-23  Rene Engelhard  <rene debian org>

        * patches/dev300/gnome-vfs-late-init.diff,
          patches/unittesting/unittesting-ucb.diff: revert last changes
        * patches/dev300/gnome-vfs-late-init-m12.diff,
          patches/unittesting/unittesting-ucb-m12.diff: remove again
        * patches/dev300/apply: adapt for above
        * patches/dev300/link-as-needed.diff: make apply (on m13, but
          there's no diff from m10 to m13 in cppcanvas/util/makefile.mk)


Added:
   trunk/patches/dev300/gnome-vfs-late-init.diff
      - copied unchanged from r12642, /trunk/patches/dev300/gnome-vfs-late-init-m12.diff
   trunk/patches/unittesting/unittesting-ucb.diff
      - copied unchanged from r12642, /trunk/patches/unittesting/unittesting-ucb-m12.diff
Removed:
   trunk/patches/dev300/gnome-vfs-late-init-m12.diff
   trunk/patches/unittesting/unittesting-ucb-m12.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/link-as-needed.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May 23 09:00:20 2008
@@ -615,11 +615,6 @@
 # unlock the stream on crash/terminate/...
 webdav-locking-unlock-on-crash.diff, i#29152, jholesov
 
-[ GnomeVFS < dev300-m13 ]
-# NOT LOCKING RELATED!
-# Move gnome-vfs out of the startup sequence, load it only when needed
-gnome-vfs-late-init-m12.diff, i#84137, jholesov
-[ GnomeVFS >= dev300-m13 ]
 # NOT LOCKING RELATED!
 # Move gnome-vfs out of the startup sequence, load it only when needed
 gnome-vfs-late-init.diff, i#84137, jholesov
@@ -2087,14 +2082,7 @@
 unittesting-testtools.diff
 unittesting-toolkit.diff
 unittesting-tools.diff
-
-[ UnitTesting < dev300-m13 ]
-unittesting-ucb-m12.diff
-
-[ UnitTesting >= dev300-m13 ]
 unittesting-ucb.diff
-
-[ UnitTesting ]
 unittesting-ucbhelper.diff
 unittesting-udkapi.diff
 unittesting-vcl.diff

Modified: trunk/patches/dev300/link-as-needed.diff
==============================================================================
--- trunk/patches/dev300/link-as-needed.diff	(original)
+++ trunk/patches/dev300/link-as-needed.diff	Fri May 23 09:00:20 2008
@@ -52,8 +52,8 @@
  
  SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
  SHL1IMPLIB= 	i$(TARGET)
--SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(SVTOOLLIB)
-+SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB) $(SVTOOLLIB)
+-SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
++SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB)
  
  SHL1LIBS=		$(SLB)$/$(TARGET).lib