ooo-build r15213 - in trunk: . patches/dev300 patches/scsolver

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 16:13:39 2009
New Revision: 15213
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15213&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/scsolver/scsolver-config-option-m39.diff:
	* patches/scsolver/scsolver-config-set-soenv-m39.diff:
	* patches/scsolver/scsolver-sc-build-lst-m39.diff:
	* patches/scsolver/scsolver-config-option.diff:
	* patches/scsolver/scsolver-config-set-soenv.diff:
	* patches/scsolver/scsolver-sc-build-lst.diff:
	* patches/dev300/apply: adjusted for dev300-m40.


Added:
   trunk/patches/scsolver/scsolver-config-option-m39.diff   (props changed)
      - copied unchanged from r15209, /trunk/patches/scsolver/scsolver-config-option.diff
   trunk/patches/scsolver/scsolver-config-set-soenv-m39.diff   (props changed)
      - copied unchanged from r15209, /trunk/patches/scsolver/scsolver-config-set-soenv.diff
   trunk/patches/scsolver/scsolver-sc-build-lst-m39.diff   (props changed)
      - copied unchanged from r15209, /trunk/patches/scsolver/scsolver-sc-build-lst.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/scsolver/scsolver-config-option.diff
   trunk/patches/scsolver/scsolver-config-set-soenv.diff
   trunk/patches/scsolver/scsolver-sc-build-lst.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 16:13:39 2009
@@ -2296,9 +2296,17 @@
 [ CalcSolver ]
 SectionOwner => kohei
 
+[ CalcSolver <= dev300-m39 ]
+scsolver-config-option-m39.diff
+scsolver-config-set-soenv-m39.diff
+scsolver-sc-build-lst-m39.diff
+
+[ CalcSolver > dev300-m39 ]
 scsolver-config-option.diff
 scsolver-config-set-soenv.diff
 scsolver-sc-build-lst.diff
+
+[ CalcSolver ]
 scsolver-sc-remove-menu.diff
 scsolver-scp2.diff
 scsolver-setup_native.diff

Modified: trunk/patches/scsolver/scsolver-config-option.diff
==============================================================================
--- trunk/patches/scsolver/scsolver-config-option.diff	(original)
+++ trunk/patches/scsolver/scsolver-config-option.diff	Wed Jan 28 16:13:39 2009
@@ -1,7 +1,7 @@
 diff --git config_office/configure.in config_office/configure.in
 index 3ba1058..3a63fef 100644
---- config_office/configure.in
-+++ config_office/configure.in
+--- configure.in.old
++++ configure.in
 @@ -125,6 +125,10 @@ AC_ARG_ENABLE(evolution2,
  [  --enable-evolution2     Allows the built-in evolution 2 addressbook
                            connectivity build to be enabled.

Modified: trunk/patches/scsolver/scsolver-config-set-soenv.diff
==============================================================================
--- trunk/patches/scsolver/scsolver-config-set-soenv.diff	(original)
+++ trunk/patches/scsolver/scsolver-config-set-soenv.diff	Wed Jan 28 16:13:39 2009
@@ -1,7 +1,7 @@
 diff --git config_office/set_soenv.in config_office/set_soenv.in
 index 912e320..b0ecdf7 100644
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
+--- set_soenv.in.old
++++ set_soenv.in
 @@ -1982,6 +1982,7 @@ ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
  ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
  ToFile( "BUILD_TYPE",        "@BUILD_TYPE@",       "e" );

Modified: trunk/patches/scsolver/scsolver-sc-build-lst.diff
==============================================================================
--- trunk/patches/scsolver/scsolver-sc-build-lst.diff	(original)
+++ trunk/patches/scsolver/scsolver-sc-build-lst.diff	Wed Jan 28 16:13:39 2009
@@ -3,8 +3,8 @@
 --- sc/prj/build.lst
 +++ sc/prj/build.lst
 @@ -1,4 +1,4 @@
--sc	sc	:	oovbaapi svx stoc uui BOOST:boost NULL
-+sc	sc	:	SCSOLVER:scsolver oovbaapi svx stoc uui BOOST:boost NULL
+-sc	sc	:	oovbaapi svx stoc uui BOOST:boost formula oox NULL
++sc	sc	:	SCSOLVER:scsolver oovbaapi svx stoc uui BOOST:boost formula oox NULL
  sc	sc										usr1	-	all	sc_mkout NULL
  sc	sc\inc									nmake	-	all	sc_inc NULL
  sc	sc\uiconfig\layout									nmake	-	all	sc_layout NULL