[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 142f9ae6e88e4b3f54a4e8e11d8a7dcab7e51c3c
Merge: 7fe1a97 c0333d6
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 3 20:09:43 2017 +0200

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

 changelog                             |  7 ++++++-
 patches/sdk-cat-sed-bin.diff          | 33 --------------------------------
 tests/control                         |  6 ++++--
 tests/patches/uicheck-standalone.diff | 36 ++++++++++++++++++++++++++++++++++-
 tests/pyuno-import                    |  6 +++++-
 tests/uicheck                         |  3 +--
 tests/{pyuno-import => uno-import}    |  0
 7 files changed, 51 insertions(+), 40 deletions(-)

diff --cc changelog
index 3130737,f0e2269..09f06c9
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,6 +1,12 @@@
 +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
+ libreoffice (1:5.4.0~rc2~git20170702-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
  
    * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
      cat and sed are in /bin... How did this ever work?

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