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

[Rene Engelhard]

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

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

commit 7fe1a97cd4b79fb054b724dedf119a23de6ffed4
Merge: c102f08 2bfee48
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jul 2 18:32:56 2017 +0200

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

 changelog                         | 30 +++++++++++++-
 patches/fix-m68k-build-again.diff | 76 ++++++++++++++++++++++++++++++++++
 patches/sdk-cat-sed-bin.diff      | 33 +++++++++++++++
 patches/series                    |  1 +
 rules                             | 35 +++++++---------
 tests/control                     |  6 +--
 tests/control.in                  | 12 ------
 tests/sdk-examples                | 86 +++++++++++++++++++++++++++++++--------
 8 files changed, 226 insertions(+), 53 deletions(-)

diff --cc changelog
index 6f2487b,6bed0f3..3130737
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,27 +1,33 @@@
 +libreoffice (1:6.0.0~alpha0~git20170622-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
+ libreoffice (1:5.4.0~rc1-2) UNRELEASED; urgency=medium
+ 
+   * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
+     cat and sed are in /bin... How did this ever work?
+   * debian/patches/fix-m68k-build-again.diff: as name says; remove
+     somehow misapplied upstream patch and reapply 5.3s m68k-alignment.diff
+ 
+   * debian/tests/control, debian/tests/sdk-examples: resemble upstream
+     build-examples check. Build all examples mentioned there.
+     (Needs zip, python3-uno and libreoffice-officbean as new test Depends:)
+   * debian/tests/sdk-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
+     (e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
+     use @builddeps@ instead
+ 
+   * 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
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 18:47:50 +0000
+ 
  libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate
diff --cc patches/series
index f7e6525,9e03b13..0f601fa
--- a/patches/series
+++ b/patches/series
@@@ -31,3 -32,6 +31,4 @@@ no-openssl.dif
  disable-sc_subsequent_filters_test-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -sdk-cat-sed-bin.diff
+ fix-m68k-build-again.diff
diff --cc rules
index b671264,a16f4f3..6cce2eb
--- a/rules
+++ b/rules
@@@ -309,15 -312,23 +309,19 @@@ ifeq "$(ENABLE_JAVA)" "y
  #  endif
    ifneq (,$(findstring kfreebsd-amd64,$(DEB_HOST_ARCH)))
      export RUN_MAKE_CHECK=n
 -    export RUN_MAKE_UICHECK=n
+     export RUN_PYTESTS=n
    endif
    ifneq (,$(findstring kfreebsd-i386,$(DEB_HOST_ARCH)))
      export RUN_MAKE_CHECK=n
 -    export RUN_MAKE_UICHECK=n
+     export RUN_PYTESTS=n
    endif
    ifneq (,$(findstring sparc64,$(DEB_HOST_ARCH)))
      export RUN_MAKE_CHECK=n
 -    export RUN_MAKE_UICHECK=n
+     export RUN_PYTESTS=n
    endif
  else
    RUN_MAKE_CHECK=n
 -  RUN_MAKE_UICHECK=n
+   RUN_PYTESTS=n
    ENABLE_JUNIT4=n
    ENABLE_CHART_TESTS=n
    ENABLE_EXPORT_VALIDATION_TESTS=n
@@@ -325,6 -336,8 +329,7 @@@
  endif
  else
    RUN_MAKE_CHECK=n
 -  RUN_MAKE_UICHECK=n
+   RUN_PYTESTS=n
    ENABLE_JUNIT4=n
    ENABLE_CHART_TESTS=n
    ENABLE_EXPORT_VALIDATION_TESTS=n

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