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

[Rene Engelhard]

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

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

commit 707712af8713b3a108cf3faa521e8f124c1c9fe8
Merge: 828d37b 124a09f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jul 11 22:37:30 2017 +0200

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

 changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc changelog
index 38ed559,7a73251..9e20102
--- a/changelog
+++ b/changelog
@@@ -6,31 -8,21 +6,31 @@@ libreoffice (1:5.4.0~rc2-1) UNRELEASED
      as otherwise it overwrites Template paths and breaks the python wizards
      (closes: #867209)
  
 -  * debian/rules:
 -    - clean up JRE Depends; we consider java6_architectures as Java arch, so
 -      let's remove the Java5 alternatives
 -  * debian/tests/control, debian/tests/sdk-examples: resemble upstream
 -    build-examples check from 5.4. Build all examples mentioned there.
 +  * debian/tests/control, debian/uitest: improve, we can only run the test
 +    now; remove build-needed
 +  * debian/tests/control, debian/tests/sdk-examples: move ...
 +  * debian/tests/control, debian/tests/odk-build-examples: ... here and use
 +    upstreams odk/build-examples check directly.
      (Needs zip, python3-uno and libreoffice-officbean as new test Depends:)
 -  * debian/tests/sdk-examples: actually set -e...
 +  * debian/tests/odk-build-examples: actually set -e...
    * debian/rules, debian/tests/control: remove extra hackery to add our
-     Build-Depends-(Indep-): to debian/tests/control.in; misses some packages
+     Build-Depends-(Indep): to debian/tests/control.in; misses some packages
      (e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
      use @builddeps@ instead
    * debian/tests/control, debian/tests/*uno-import.diff: split; make
      pyuno-import test import pyuno while uno-import does import uno
-     (the uichecks do the former). add python3 Depends: for safety
+     (the uichecks do the former).
    * debian/test/control: sort by importance
 +  * debian/tests/: unapply patch after the make (or on error) so that the
 +    next test can patch it...
 +
 +  * debian/rules:
 +    - be consequent and set RUN_PYTESTS=n (and RUN_MAKE_UICHECK=n) where we set
 +      RUN_MAKE_CHECK=n
 +    - be consequent and add $(IGNORE_MAKE_CHECK_FAILURES) also to the "extra"
 +      test runs
 +  * debian/control.in:
 +    - make -common Conflicts: older mediawikis to go sure
  
   -- Rene Engelhard <rene at debian.org>  Tue, 11 Jul 2017 20:52:21 +0200
  

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