ooo-build r14903 - in branches/ooo-build-3-0-1: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Dec 19 17:35:16 2008
New Revision: 14903
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14903&view=rev

Log:
2008-12-19  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/webdav-locking-from-ooo-build-2-4-1-m13.diff: copy
          from webdav-locking-from-ooo-build-2-4-1.diff yet without changes
          in webdav-locking-from-ooo-build-2-4-1.diff for m14 and temporarily
          disable applying of it for m14


Added:
   branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1-m13.diff   (props changed)
      - copied unchanged from r14899, /branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Fri Dec 19 17:35:16 2008
@@ -520,13 +520,21 @@
 cws-webdavandgvfslocking1-ucb.diff
 cws-webdavandgvfslocking1-unotools.diff
 
-[ WebDAV > ooo300-m12 ]
+[ WebDAV == ooo300-m12 ]
 SectionOwner => jholesov
 SectionIssue => i#29152
 # WebDAV locking implementation - the original version
 # This is forward-ported from ooo-build-2-4-1, because the version for
 # up-streaming still does not work as expected :-(
-webdav-locking-from-ooo-build-2-4-1.diff
+#FIXME m14 webdav-locking-from-ooo-build-2-4-1.diff
+
+[ WebDAV == ooo300-m13 ]
+SectionOwner => jholesov
+SectionIssue => i#29152
+# WebDAV locking implementation - the original version
+# This is forward-ported from ooo-build-2-4-1, because the version for
+# up-streaming still does not work as expected :-(
+webdav-locking-from-ooo-build-2-4-1-m13.diff
 
 [ WebDAV <= ooo300-m12 ]
 SectionOwner => jholesov