[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit a5c3e9ecd877ab3be13e868ad0441b79d1093fe7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Feb 17 11:19:19 2011 +0200

    Make the now non-empty WebDAV set NovellOnly until approved
    
    I want to be able to commit work on this in pieces at my own pace, so
    don't "force" it upon other distros yet. Once I am reasonably certain
    that it is good enough, I will ask for approval to put it in Common.
    
    I can't really do this in master, as I want this for the Novell 3.3.1
    or 3.3.2 build.
    
    The patches in WebDAVUpstream is better classified as
    UnUsedButNotYetRemovedFromGit. Actually I guess I should just remove
    them.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a563f0b..354b679 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -13,7 +13,7 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, CalcFixes, WriterFixes, EasterEgg, \
-	 CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
+	 CWSBackports, Cleanups, WMF, GnomeVFS, \
 	 Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
 	 FedoraCommonFixes, LayoutDialogs, Fuzz, \
@@ -28,7 +28,7 @@ MacOSXCommon : Common, Defaults
 Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebian
 # Experimental sections
 Experimental: VBAUntested, ArkOnlyExperimental, \
-	      UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
+	      UnUsedButNotYetRemovedFromGit, \
 	      PostgreSQL, SELinux, \
 	      UnitBootstrap, RadioButtons, WWInProgress, \
 	      KDE4Experimental, MinGW, CalcExperimental, \
@@ -387,16 +387,11 @@ dialog-groupname-persist.diff, noelpwer, i#30823
 ooo80816.selinux.bridges.diff, i#80816
 
 
-[ WebDAVUpstream ]
+[ UnUsedButNotYetRemovedFromGit ]
 SectionOwner => jholesov
 SectionIssue => i#29152
-# WebDAV locking implementation - the up-stream version
+# WebDAV locking implementation - totally out-of-date
 
-# FIXME: 2009-10-05: I *think* "up-stream version" means that these
-# patches were/are the webdavandgvfslocking1 CWS which was abandoned
-# at dev300-m37, after which the affected upstream code has gone
-# through significant changes and forward porting the CWS is
-# hellish. --tml
 cws-webdavandgvfslocking1-comphelper.diff
 cws-webdavandgvfslocking1-officecfg.diff
 cws-webdavandgvfslocking1-sal.diff
@@ -1373,7 +1368,7 @@ vba-import-xlsm.diff
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
 
 
-[ WebDAV ]
+[ NovellOnly ]
 SectionOwner => tml
 SectionIssue => bnc#651977