ooo-build r13529 - in trunk: . bin patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Aug 12 17:51:05 2008
New Revision: 13529
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13529&view=rev

Log:
2008-08-12  Kohei Yoshida  <kyoshida novell com>

	* bin/unpack:
	* download.in: updated package scsolver.2008-08-12.tar.bz2 to download
	which fixes the --with-system-lpsolve build problem.
	
	* patches/dev300/apply: moved CalcSolver back into Common once again.


Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/apply

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Aug 12 17:51:05 2008
@@ -588,7 +588,7 @@
 fi
 
 # Calc Solver
-SCSOLVER_PACKAGE=scsolver.2008-08-11.tar.bz2
+SCSOLVER_PACKAGE=scsolver.2008-08-12.tar.bz2
 check_tarball $SRCDIR/$SCSOLVER_PACKAGE
 tar xfj $SRCDIR/$SCSOLVER_PACKAGE -C $OOBUILDDIR
 

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Aug 12 17:51:05 2008
@@ -316,7 +316,7 @@
 }
 
 if ('true' ne '') {
-   push @files, ( 'scsolver.2008-08-11.tar.bz2' );
+   push @files, ( 'scsolver.2008-08-12.tar.bz2' );
 }
 
 if ('@SYSTEM_LIBWPD@' eq 'NO') {

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 12 17:51:05 2008
@@ -17,7 +17,7 @@
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
-	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs
+	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, CalcSolver
 
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -52,7 +52,7 @@
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, Split, Shrink, \
-	     CustomUserConfig, CalcSolver
+	     CustomUserConfig
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase