[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 d484e14c4c17ed08bbc3b867b083c2561c8409bd
Merge: ed09a9f f710689
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jun 26 19:32:18 2017 +0200

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

 changelog          | 7 +++++++
 tests/sdk-examples | 4 ++++
 2 files changed, 11 insertions(+)

diff --cc changelog
index f578194,cae8714..6e7c4e3
--- a/changelog
+++ b/changelog
@@@ -1,40 -1,22 +1,47 @@@
 -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/rules:
 -    - clean up JRE Depends; we consider java6_architectures as Java arch, so
 -      let's remove the Java5 alternatives
+   * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
+     needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 19:25:59 +0200
+ 
 -libreoffice (1:5.3.4-1) unstable; urgency=medium
 +libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
  
 -  * New upstream release
 +  * 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
 +  * debian/copyright, debian/source/include-binaries: remove xmlsec
 +  * debian/rules:
 +    - fix dh_missing call
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 25 Jun 2017 20:04:27 +0200
 +
 +libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
 +
 +  * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
 +    (from master)
    * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
      JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
 +  * debian/patches/gerrit_38597.diff: add from gerrit for master, fixes
 +    i386 tests
 +
 +  * debian/rules, debian/scripts/locale-gen: upstream insists on using
 +    en_US.UTF-8 for the tests. "Steal" the locale-gen stuff from gcc
 +  * debian/control.in: make -core depend on ure (>= 5.4.0~beta2~)
 +    (closes: #864690)
    * debian/control.in:
      - make -gstreamer recommend gstreamer1.0-plugins-bad as we apparently
        want/need gtksink

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