[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.

commit 262381ea7b32e221ef2ab7ca46149a99ff3b0693
Merge: b02e862 a7a902f
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 7 00:08:32 2017 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

 rules | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc rules
index 45f351b,9b00d21..fafb656
--- a/rules
+++ b/rules
@@@ -286,7 -288,9 +286,8 @@@ ifeq "$(ENABLE_JAVA)" "y
          ENABLE_EXPORT_VALIDATION_TESTS=n
      else
        RUN_MAKE_CHECK=n
 -      RUN_MAKE_UICHECK=n
        ENABLE_JUNIT4=n
+       RUN_PYTESTS=n
        ENABLE_CHART_TESTS=n
        ENABLE_EXPORT_VALIDATION_TESTS=n
        BUILD_TEST_PACKAGE=n

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git