[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.3_rc1-2-1-gbcfd78d

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit bcfd78d50ee56652033c16c6ff9c9186642e6323
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Apr 21 21:39:06 2013 +0200

    fix check rule again: move - where it actually works; also ignore  test failures on s390 and powerpc and simplify logic

diff --git a/changelog b/changelog
index 7f51415..f772249 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.3~rc1-3) experimental; urgency=low
+
+  * The "the third time is a charm" release
+  * fix check rule again: move - where it actually works; also ignore
+    test failures on s390 and powerpc and simplify logic
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 21 Apr 2013 17:14:49 +0200
+
 libreoffice (1:4.0.3~rc1-2) experimental; urgency=low
 
   * brown paper bag release
diff --git a/rules b/rules
index ee9d172..304c7fd 100755
--- a/rules
+++ b/rules
@@ -257,17 +257,14 @@ ifeq "$(ENABLE_JAVA)" "y"
     ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
       RUN_MAKE_CHECK=y
       ENABLE_JUNIT4=y
-      IGNORE_MAKE_CHECK_FAILURES=
     endif
   else
     ifeq "$(JDK)" "openjdk"
       RUN_MAKE_CHECK=y
       ENABLE_JUNIT4=y
-      IGNORE_MAKE_CHECK_FAILURES=
     else
       RUN_MAKE_CHECK=n
       ENABLE_JUNIT4=n
-      IGNORE_MAKE_CHECK_FAILURES=-
     endif
   endif
 else
@@ -418,17 +415,14 @@ ifeq "$(ENABLE_OPENGL)" "y"
   $(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
 endif
 
-ifeq (armhf,$(findstring armhf,$(DEB_HOST_ARCH)))
-IGNORE_MAKE_CHECK_FAILURES:=-
-endif
-ifeq (ia64,$(findstring ia64,$(DEB_HOST_ARCH)))
-IGNORE_MAKE_CHECK_FAILURES:=-
-endif
-ifeq (sparc,$(findstring sparc,$(DEB_HOST_ARCH)))
-IGNORE_MAKE_CHECK_FAILURES:=-
-endif
-ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
-IGNORE_MAKE_CHECK_FAILURES:=-
+IGNORE_MAKE_CHECK_FAILURES=-
+ifneq "$(JDK)" "gcj"
+  ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
+IGNORE_MAKE_CHECK_FAILURES:=
+  endif
+  ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+IGNORE_MAKE_CHECK_FAILURES:=
+  endif
 endif
 
 OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
@@ -1736,14 +1730,14 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
 		patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
 endif
 
-	t=`mktemp -q -d`; \
+	$(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \
 	cd $(SOURCE_TREE) && \
 		export PATH=$(BUILD_PATH); \
 		export TMPDIR=$$t; \
 		export HOME=$$t; \
 		export SAL_USE_VCLPLUGIN="svp"; \
 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
-		$(IGNORE_MAKE_CHECK_FAILURES)$(MAKE) -k check || $(MAKE) check && \
+		$(MAKE) -k check || $(MAKE) check && \
 	rm -rf $$t
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))

-- 
LibreOffice packaging repository