[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 b02e862c361893658032ec3d52a2c8d5a3e3a1cd
Merge: 3913906 ca70876
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jun 6 23:45:37 2017 +0200

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

 rules | 6 ------
 1 file changed, 6 deletions(-)

diff --cc rules
index fafb656,c693078..45f351b
--- a/rules
+++ b/rules
@@@ -286,8 -288,8 +286,7 @@@ 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