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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Dec 10 16:26:50 2008
New Revision: 14813
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14813&view=rev

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

        * patches/dev300/apply: mailmerge-ssl-ehlo.diff, sfx2-shutdownicon-3layer.diff
          and ucb-gio-gnome-init.diff are (supposed to) go into m38


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 10 16:26:50 2008
@@ -436,6 +436,7 @@
 # allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
 xmlsecurity-verify-usages.diff, i#76871, pmladek
 
+[ Fixes < dev300-m38 ]
 mailmerge-ssl-ehlo.diff, i#76655, deb#5074448
 
 [ LinuxOnly ]
@@ -495,9 +496,11 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+[ Fixes < dev300-m38 ]
 # fix the GNOME quickstarter to work again
 sfx2-shutdownicon-3layer.diff, bnc#434778, i#95223, pmladek
 
+[ Fixes ]
 # make CustomUnitText "Pixel" localisable
 customunittext-pixel.diff, i#61043, atimar
 
@@ -1073,6 +1076,7 @@
 # actually add mozilla includes
 extensions-missing-MOZ_INC.diff, i#96912
 
+[ BuildBits < dev300-m38 ]
 # call g_type_init() before using GIO;
 # avoid crash when using GIO in non-GNOME Window manager
 ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks