ooo-build r14744 - in trunk: . patches/dev300
- From: tml svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14744 - in trunk: . patches/dev300
- Date: Thu, 4 Dec 2008 14:17:38 +0000 (UTC)
Author: tml
Date: Thu Dec 4 14:17:38 2008
New Revision: 14744
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14744&view=rev
Log:
2008-12-04 Tor Lillqvist <tml novell com>
* patches/dev300/apply
* patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
* patches/dev300/webdav-locking-from-ooo-build-2-4-1-m36.diff:
Split at m37. Note that the patch does not apply as such to
dev300-m37, so commented out with FIXME comment so far for that.
Added:
trunk/patches/dev300/webdav-locking-from-ooo-build-2-4-1-m36.diff (props changed)
- copied unchanged from r14742, /trunk/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu Dec 4 14:17:38 2008
@@ -574,10 +574,21 @@
[ WebDAV ]
SectionOwner => jholesov
SectionIssue => i#29152
+
+[ WebDAV < dev300-m37 ]
# 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
+webdav-locking-from-ooo-build-2-4-1-m36.diff
+
+[ WebDAV >= dev300-m37 ]
+# 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 :-(
+# FIXME 2008-12-04: doesn't apply to dev300-m37
+#webdav-locking-from-ooo-build-2-4-1.diff
+
+[ WebDAV ]
# fix saving files on Novell teaming via WebDaV
webdav-locking-local-temp-file.diff, bnc#440514, kendy
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]