[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-3-17-gebad8d6

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit ebad8d661e18d3d6f169da01b9bd842fb35efff0
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Sep 30 02:57:09 2011 +0200

    run new "make check" instead of solenv/bin/subsequenttests

diff --git a/changelog b/changelog
index 28ff430..19e436c 100644
--- a/changelog
+++ b/changelog
@@ -13,11 +13,12 @@ libreoffice (1:3.5.0~git20110928-1) UNRELEASED; urgency=low
       Also build python3-uno
     - add new conditionals and build-deps for new libvisio,librsvg,gettext
       usage and libexttextcat switch
+    - run new "make check" instead of solenv/bin/subsequenttests
   * debian/rules, debian/control.in: 
     - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
       /usr/share/dpkg/*.mk
 
- -- Rene Engelhard <rene@debian.org>  Wed, 28 Sep 2011 09:02:08 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 30 Sep 2011 02:56:18 +0200
 
 libreoffice (1:3.4.3-3) unstable; urgency=low
 
diff --git a/rules b/rules
index 1d16d29..b214ccb 100755
--- a/rules
+++ b/rules
@@ -209,20 +209,19 @@ NEONSONR=27
 SYSTEM_STUFF += redland
 USE_OOO_BUILD_DESKTOPS=n
 PACKAGE_SDK=y
-# FIXME: subsequenttests breaks with to high debug level 11
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "openjdk"
     RUN_SMOKETEST=n
-    RUN_SUBSEQUENT_TESTS=n
+    RUN_MAKE_CHECK=n
   else
     ifneq ($(ON_BUILDD),y)
       RUN_SMOKETEST=n
-      RUN_SUBSEQUENT_TESTS=n
+      RUN_MAKE_CHECK=n
     endif
   endif
 else
   RUN_SMOKETEST=n
-  RUN_SUBSEQUENT_TESTS=n
+  RUN_MAKE_CHECK=n
 endif
 # "Unfortunately, running the unoapi tests is still not stable enough to give
 # useful results. Therefore, running subsequenttests has been disabled in the
@@ -657,7 +656,7 @@ endif
 ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libcppunit-dev (>= 1.12)
 endif
-ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
+ifeq "$(RUN_MAKE_CHECK)" "y"
 	BUILD_DEPS += , tcsh
   ifeq "$(ENABLE_JUNIT4)" "y"
 	BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
@@ -1861,12 +1860,11 @@ ifeq "$(DEB_HOST_ARCH)" "armel"
 		patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
 endif
 endif
-ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
+ifeq "$(RUN_MAKE_CHECK)" "y"
 	cd $(SOURCE_TREE) && \
 		export PATH=$(BUILD_PATH); \
 		. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
-		chmod 755 solenv/bin/subsequenttests && \
-		solenv/bin/subsequenttests
+		$(MAKE) check
 endif
 
 install: $(STAMP_DIR)/install

-- 
LibreOffice packaging repository