ooo-build r13619 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Tue Aug 19 09:36:33 2008
New Revision: 13619
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13619&view=rev

Log:
2008-08-19  Jan Holesovsky  <kendy suse cz>

        * configure.in,
          patches/dev300/apply: Default to ooo300-m3.


Modified:
   trunk/configure.in
   trunk/patches/dev300/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug 19 09:36:33 2008
@@ -3,7 +3,7 @@
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=ooo300-m2
+DEFAULT_TAG=ooo300-m3
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOH680_m12
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 19 09:36:33 2008
@@ -13,7 +13,7 @@
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 Fixes, DefaultSettings, Features, VCL, Misc, \
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
-	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
+	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
@@ -28,7 +28,7 @@
 	      Win32Only, NotDebian
 # Experimental sections
 Experimental: VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
-	      UnUsedButNotYetRemovedFromSVN, \
+	      UnUsedButNotYetRemovedFromSVN, WebDAVUpstream, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, KDE4
 DebianLooseSections: DebianBaseNoHelpContent, DebianBaseSystemJFreeReport, \
@@ -293,22 +293,6 @@
 wpsimport-writerperfect.diff
 libwps.diff
 
-[ CWSBackports < dev300-m25 > beb300-m0 ]
-# WebDAV locking implementation
-cws-webdavandgvfslocking1-comphelper.diff
-cws-webdavandgvfslocking1-officecfg.diff
-cws-webdavandgvfslocking1-sal.diff
-cws-webdavandgvfslocking1-sc.diff
-cws-webdavandgvfslocking1-sfx2.diff
-cws-webdavandgvfslocking1-tools.diff
-cws-webdavandgvfslocking1-ucb.diff
-cws-webdavandgvfslocking1-unotools.diff
-# don't lock for infinite, instead set timeout to 3 minutes, and refresh 30
-# sec before expiration
-# FIXME this is now part of cws-webdavandgvfslocking1-ucb.diff
-# FIXME remove after copied to ooo-build-2-4-1
-#webdav-locking-refresh-lock.diff, n#403724, jholesov
-
 [ CWSBackports ]
 #basic runtime fixes
 basic-add-missing-includes-after-cws-npower10.diff
@@ -537,6 +521,26 @@
 accept-underscores-in-hostnames.diff, n#182422, tml
 
 
+[ WebDAVUpstream ]
+# WebDAV locking implementation - the up-stream version
+cws-webdavandgvfslocking1-comphelper.diff
+cws-webdavandgvfslocking1-officecfg.diff
+cws-webdavandgvfslocking1-sal.diff
+cws-webdavandgvfslocking1-sc.diff
+cws-webdavandgvfslocking1-sfx2.diff
+cws-webdavandgvfslocking1-tools.diff
+cws-webdavandgvfslocking1-ucb.diff
+cws-webdavandgvfslocking1-unotools.diff
+
+[ WebDAV ]
+# WebDAV locking implementation - the original version
+# don't lock for infinite, instead set timeout to 3 minutes, and refresh 30
+# sec before expiration
+# FIXME this is now part of cws-webdavandgvfslocking1-ucb.diff
+# FIXME remove after copied to ooo-build-2-4-1
+#webdav-locking-refresh-lock.diff, n#403724, jholesov
+
+
 [ GnomeVFS ]
 # gnome-vfs locking implementation
 # it was not committed up-stream yet because up-stream uses so old gnome-vfs
@@ -739,12 +743,13 @@
 chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, kohei
 chart-skip-hidden-cells-sc.diff, n#404190, i#81209, kohei
 
-# Fix a regression on filtering by page field.
-calc-fix-datapilot-date-filter.diff, i#90022, kohei
-
 # When filtering by date, strip off the time element from each value.
 calc-filter-by-date-strip-time.diff, n#414303, kohei
 
+[ CalcFixes < ooo300-m3 ]
+# Fix a regression on filtering by page field.
+calc-fix-datapilot-date-filter.diff, i#90022, kohei
+
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 speed-local-link-except.diff, i#63927, michael
@@ -1539,7 +1544,6 @@
 
 # Fixed for n#407805
 basic-not-is-nothing.diff, n#407805, Fong
-bytearray-string-fix.diff, i#91911, Fong
 basic-replace-function-fix.diff, n#411203, Fong
 # keywords (including NAME, LINE, TEXT) can be used as variable 
 vba-keyword-fix.diff, n#403586, Fong
@@ -1584,6 +1588,10 @@
 vba-worksheet-fix-n403974.diff, n#403974, Fong
 vba-range-find-fix.diff, n#417312, Fong
 
+[ VBAObjects < ooo300-m3 ]
+bytearray-string-fix.diff, i#91911, Fong
+
+
 [ Features ]
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian