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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Apr 14 22:29:07 2008
New Revision: 12161
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12161&view=rev

Log:
2008-04-14  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/novell-win32-agfa-monotype-fonts.diff: fixed to make it
	apply again after the dejavu patches moved.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff

Modified: trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff	(original)
+++ trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff	Mon Apr 14 22:29:07 2008
@@ -123,12 +123,12 @@
 +bs	agfa_monotype_fonts : solenv NULL
 +bs	agfa_monotype_fonts		usr1	-	all	amt_mkout NULL
 +bs	agfa_monotype_fonts		nmake	-	all	amt_fonts NULL
---- scp2/source/ooo/file_font_ooo.scp.OLD	2005-09-09 04:37:10.000000000 +0300
-+++ scp2/source/ooo/file_font_ooo.scp	2005-11-23 05:08:35.375000000 +0200
-@@ -151,3 +151,31 @@
+--- scp2.clean/source/ooo/file_font_ooo.scp	2008-04-14 17:22:10.000000000 -0400
++++ scp2/source/ooo/file_font_ooo.scp	2008-04-14 17:23:29.000000000 -0400
+@@ -206,3 +206,31 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSe
  STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
  #endif
- 
+ #endif
 +
 +#ifdef WNT
 +#ifdef WITH_AGFA_MONOTYPE_FONTS