ooo-build r11387 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 23 21:08:33 2008
New Revision: 11387
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11387&view=rev

Log:
        * patches/src680/apply: apply libsn-removal.diff,
          ooo84684.vcl.fixfontconfig.diff and psprint-do-not-substitute.diff
          for < ooh680-m5


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 23 21:08:33 2008
@@ -559,6 +559,7 @@
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
+[ QuickStarter < ooh60-m5 ]
 # libstartup-notification is not necessary with oosplash.bin
 libsn-removal.diff, i#84179, jholesov
 
@@ -764,6 +765,7 @@
 # html in ISO-8859-2 encoding.
 svtools-html-iso-8859-2-ignore-chars.diff, i#15456, kohei
 
+[ Misc < ooh680-m5 ]
 # Don't substitute downloadable fonts with resident fonts.
 psprint-do-not-substitute.diff, i#84481, kohei
 
@@ -1662,8 +1664,11 @@
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff
+
+[ FedoraFixes < ooh680-m5 ]
 ooo84684.vcl.fixfontconfig.diff
 
+[ FedoraFixes ]
 ooo67658.sfx2.reloadcrash.diff
 
 oooXXXXX.vcl.x86_64.impressatk.diff