[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 19ab8be5d30362e172fca0ca92c592893febdc01
Merge: 5f046c7 4d6a52e
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 22 22:11:06 2017 +0200

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

 changelog | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --cc changelog
index 53db2df,4c731d2..3152792
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,6 +1,12 @@@
 +libreoffice (1:6.0.0~alpha0~git20170622-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
-   * debian/rules: add conditional for system-xmlsec. yay. not enabled yet given
-     it needs >= 1.2.24 which is not yet in Debian.
- 
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.0~rc1~git20170616-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
  
-   * New upstream snapshot
+   * New upstream release candidate
  
    * debian/tests/control.in, debian/tests/uicheck,
      debian/tests/patches/uicheck-standalone.diff: add initial version

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