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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 13:19:07 2008
New Revision: 14635
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14635&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/sfx2-remove-check-update-on-fileload-m35.diff:
	Add separate copy of this patch for m35, comment out the m36
	version so far.



Added:
   trunk/patches/dev300/sfx2-remove-check-update-on-fileload-m35.diff   (props changed)
      - copied unchanged from r14630, /trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 13:19:07 2008
@@ -877,13 +877,16 @@
 [ PopupRemoval ]
 # Remove unnecessary popups that might show up during startup.
 
+[ PopupRemoval < dev300-m36 ]
 # remove updater code that is only relevant for the upstream version.
+sfx2-remove-check-update-on-fileload-m35.diff, kohei
 
-[ PopupRemoval < dev300-m36 ]
+[ PopupRemoval >= dev300-m36 ]
+# remove updater code that is only relevant for the upstream version.
 # FIXME 2008-11-28: kohei, please check what has happened to the
 # affected code in dev300-m36, at least the file
 # sfx2/source/dialog/newerverwarn.cxx is not there any longer
-sfx2-remove-check-update-on-fileload.diff, kohei
+#sfx2-remove-check-update-on-fileload.diff, kohei
 
 [ PopupRemoval ]
 # prevent the registration dialog from showing up on startup.