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

[tml svn gnome org]

Author: tml
Date: Wed Oct 22 07:57:51 2008
New Revision: 14390
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14390&view=rev

Log:
2008-10-22  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Move psprint.defconfig_changes.diff to
	CairoFonts as it seems to require previous patches that are in
	that set (or some other Linux-only set).



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Oct 22 07:57:51 2008
@@ -2788,7 +2788,7 @@
 
 # stop font updatess crashing OO.o - to be merged up-stream
 # soon, hence < m28
-[ Fixes < dev300-m28 >= ooo300-m9 ]
+[ CairoFonts < dev300-m28 >= ooo300-m9 ]
 psprint.defconfig_changes.diff, n#436441, flr
-[ Fixes < dev300-m28 < ooo300-m9 ]
+[ CairoFonts < dev300-m28 < ooo300-m9 ]
 psprint.defconfig_changes-m7.diff, n#436441, flr