[Libreoffice-commits] .: bin/ooinstall patches/dev300

[Michael Meeks]

 bin/ooinstall        |    2 +-
 patches/dev300/apply |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 5eab59282b45d556cd76f76e5261ff1ff75646ce
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Oct 26 13:42:57 2010 +0100

    fail early if we can't install

diff --git a/bin/ooinstall b/bin/ooinstall
index bcda9b9..b5d29ab 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -69,7 +69,7 @@ if ($help) {
 $sources_path=Cwd::realpath($setup_vars{'OOBUILDDIR'});
 
 # Call the solenv/bin/ooinstall
-system ("cd $sources_path ; . ./*Set.sh ; solenv/bin/ooinstall $linked $path");
+system ("cd $sources_path ; . ./*Set.sh ; solenv/bin/ooinstall $linked $path") && die "Failed to ooinstall";
 
 print "Installing extra dictionaries...\n";
 system ("cd $setup_vars{TOOLSDIR}/bin ; " .
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5ff7bfc..5f59024 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -17,7 +17,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
 	 FedoraCommonFixes, LayoutDialogs, Fuzz, \
-	 CalcRowLimit, BuildFix, WriterDocComparison, \
+	 BuildFix, WriterDocComparison, \
 	 MySQL, BorderTypes, WriterNavigation
 
 LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
@@ -451,10 +451,6 @@ calc-string-number.diff, kohei
 # LATER: I'll take care of this later.  --kohei
 # calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
 
-[ CalcRowLimit ]
-# The work to increase Calc's row size limit, and any work associated with it.
-SectionOwner => kohei
-
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...
@@ -2103,7 +2099,6 @@ SectionOwner => kohei
 # line even if matching quotes are on separate lines.
 stream-read-csv-always-single-line.diff, n#523517, kohei
 
-
 [ AutoLayout ]
 impress-autolayout.diff, cocofan