[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.6-2-2-g7e41978
The following commit has been merged in the master branch:
commit 7e41978b35124138df1fddebce05c3c9f6ae9ca7
Author: Rene Engelhard <rene@debian.org>
Date: Sun Mar 25 14:18:15 2012 +0000
make make check failure abort again
diff --git a/changelog b/changelog
index 09f90c5..dda416c 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:3.4.6-3) UNRELEASED; urgency=low
* debian/patches/glib-single-include.patch: fix gvfs build for
glib >= 2.32, thanks Michael Biebl (closes: #665574)
+ * debian/rules:
+ - make make check failure abort again
-- Rene Engelhard <rene@debian.org> Sun, 25 Mar 2012 18:16:52 +0200
diff --git a/rules b/rules
index 3dc27f4..7770699 100755
--- a/rules
+++ b/rules
@@ -1856,7 +1856,7 @@ endif
export JAVA_HOME=$(TEST_JAVA_HOME); \
export SAL_USE_VCLPLUGIN="svp"; \
export HOME=$$t; \
- ../solenv/bin/build.pl; \
+ ../solenv/bin/build.pl && \
rm -rf $$t
ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketestoo_native && \
--
LibreOffice packaging repository
Reply to: