[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 77d2548ba9352e9a4c8bd012a459ba3483cfed0a
Merge: 821e255 5b1a56b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jun 24 16:11:12 2017 +0200

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

 changelog | 5 ++++-
 rules     | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --cc changelog
index 7b89b74,890cf0e..8831eca
--- a/changelog
+++ b/changelog
@@@ -1,35 -1,17 +1,38 @@@
 -libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
 +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. yay. not enabled yet given
 +    it needs >= 1.2.24 which is not yet in Debian.
 +
 +  * 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
  
-  -- Rene Engelhard <rene at debian.org>  Sat, 24 Jun 2017 14:03:19 +0200
+  -- Rene Engelhard <rene at debian.org>  Sat, 24 Jun 2017 16:09:11 +0200
  
 -libreoffice (1:5.3.4-1) unstable; urgency=medium
 -
 -  * New upstream release
 +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