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

[szalaik svn gnome org]

Author: szalaik
Date: Fri Aug 15 13:47:39 2008
New Revision: 13592
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13592&view=rev

Log:
2008-08-15  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/scp2_build_accessories.diff: Fix break
	* patches/dev300/apply: Fix typo



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/scp2_build_accessories.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Aug 15 13:47:39 2008
@@ -133,9 +133,9 @@
 OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
 	      			LinuxOnly, SystemBits, \
 	      			msaccess, OpenGLTransitions, \
-	      			Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions
-OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions
-OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions
+	      			Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions, DejaVuFonts
+OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, DejaVuFonts
+OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, DejaVuFonts
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras

Modified: trunk/patches/dev300/scp2_build_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_build_accessories.diff	Fri Aug 15 13:47:39 2008
@@ -4,7 +4,7 @@
  cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
  cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL