ooo-build r13157 - in trunk: . distro-configs patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Jul 11 11:23:52 2008
New Revision: 13157
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13157&view=rev

Log:
2008-07-11  Tor Lillqvist  <tml novell com>

	* distro-configs/CommonWin32.conf.in: Remove --disable-layout again.

	* patches/dev300/apply: Move LayoutDialogs to Common. Drop
	dont-build-transex3-layout-on-windows.diff.

	* patches/dev300/dont-build-transex3-layout-on-windows.diff: Remove.



Removed:
   trunk/patches/dev300/dont-build-transex3-layout-on-windows.diff
Modified:
   trunk/ChangeLog
   trunk/distro-configs/CommonWin32.conf.in
   trunk/patches/dev300/apply

Modified: trunk/distro-configs/CommonWin32.conf.in
==============================================================================
--- trunk/distro-configs/CommonWin32.conf.in	(original)
+++ trunk/distro-configs/CommonWin32.conf.in	Fri Jul 11 11:23:52 2008
@@ -1,4 +1,3 @@
 --with-ant-home=$BUILDDIR/apache-ant-1.7.0
 --with-build-version=\"Build `date +%Y-%m-%d`\"
 --with-vba-package-format=builtin
---disable-layout

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 11 11:23:52 2008
@@ -17,9 +17,9 @@
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
-	 FedoraCommonFixes, InternalMesaHeaders
+	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs
 
-LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
+LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
 	      msaccess, OpenGLTransitions, \
 	      Fpickers, Mono, AddressBooks, QuickStarter
@@ -2453,9 +2453,5 @@
 piece-solarbindir.diff
 piece-rsc.diff
 
-
-[ Win32Only ]
-dont-build-transex3-layout-on-windows.diff, tml
-
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten