[libreoffice] 02/02: 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 2bfee4833ce6bc39aefd1f4c426b475442668366
Merge: a8780f2 aeaccc8
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Jul 2 18:17:51 2017 +0200

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

 changelog        |  4 ++++
 rules            | 16 +---------------
 tests/control    |  4 ++--
 tests/control.in | 12 ------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --cc changelog
index a9d702e,228bb8a..6bed0f3
--- a/changelog
+++ b/changelog
@@@ -1,38 -1,10 +1,42 @@@
 -libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
 +libreoffice (1:5.4.0~rc1-2) UNRELEASED; urgency=medium
  
 -  * debian/patches/icu-59-uchar.diff: backport patch from 5.4 to fix build
 -    with ICU 59 (this only affects some internal libs, but...)
    * 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
 +
 +  * debian/tests/control.in, debian/tests/uicheck,
 +    debian/tests/patches/uicheck-standalone.diff: add initial version
 +    of autopgktest running uitest 
 +
 +  * debian/rules, debian/patches/system-xmlsec.diff: backport patch from
 +    master and add conditional for system-xmlsec. use it.
 +
 +  * debian/rules, debian/control.lokit.in:
 +    - move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and
 +      make libreofficekit-dev depend on gir1.2-lokdocview-0.1 as per gir
 +      policy
    * debian/rules:
      - clean up JRE Depends; we consider java6_architectures as Java arch, so
        let's remove the Java5 alternatives
diff --cc tests/control
index edfdc69,db4ca52..c8cfeb3
--- a/tests/control
+++ b/tests/control
@@@ -4,9 -4,5 +4,9 @@@ Depends: @builddeps@, libreoffice, libr
  Tests: pyuno-import
  Depends: python3-uno
  
 +Tests: uicheck
- Depends: libreoffice, python3, python3-uno, locales, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpc [...]
++Depends: @builddeps@, libreoffice, python3-uno, locales
 +Restrictions: build-needed
 +
  Tests: sdk-examples
 -Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
 +Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk, python3-uno, libreoffice-officebean, zip

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