[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.1-1-140-gb226b7a
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit ba24215caccb61d016ebdd909186ebe8653790d3
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jul 8 16:14:49 2011 +0200
disable subsequent tests for now, fix typo
diff --git a/rules b/rules
index 6fb53dd..cfcdfac 100755
--- a/rules
+++ b/rules
@@ -142,7 +142,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
# see http://bugs.debian.org/610817
JAVAHELPER_MIN_VERSION= (>= 0.35)
-ENABLE_MONO=y
+ENABLE_MONO=n
MONO2=y
ifeq "$(MONO2)" "y"
MONO_MINVER= (>= 2.4.2.3)
@@ -220,7 +220,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
else
RUN_SMOKETEST=n
- RUN_SUBSQUENT_TESTS=n
+ RUN_SUBSEQUENT_TESTS=n
endif
# "Unfortunately, running the unoapi tests is still not stable enough to give
# useful results. Therefore, running subsequenttests has been disabled in the
@@ -479,6 +479,8 @@ ifeq "$(DIST)" "Ubuntu"
ENABLE_EVO2=n
# FIXME: disable opensymbol for now
PACKAGE_TTF_OPENSYMBOL=n
+ # FIXME: breaks with to high debug level 11
+ RUN_SUBSEQUENT_TESTS =n
endif
ifeq "$(L10N_SEPARATE_SOURCE)" "y"
--
LibreOffice packaging repository
Reply to: