[libreoffice] 03/03: 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 5f046c711f8d9fb82f19da65e34564ab2b254545
Merge: 72c9d57 9643b0f
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 22 19:08:52 2017 +0200

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

 changelog                             |   6 +-
 control                               |   4 +-
 control.in                            |   4 +-
 copyright                             | 369 +---------------------------------
 patches/disable-flaky-tests.diff      |  27 +++
 tests/control                         |   4 +
 tests/control.in                      |   4 +
 tests/junit-subsequentcheck           |   3 +-
 tests/patches/uicheck-standalone.diff |  35 ++++
 tests/uicheck                         |  51 +++++
 10 files changed, 136 insertions(+), 371 deletions(-)

diff --cc control
index 231414e,35705b6..994f1cc
--- a/control
+++ b/control
@@@ -189,8 -189,8 +189,8 @@@ Build-Conflicts: amd-libopencl1
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1,
                   qt3-dev-tools
- Standards-Version: 3.9.4
- Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.5
+ Standards-Version: 4.0.0
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
++Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
  Bugs: 
  Homepage: http://www.libreoffice.org
diff --cc control.in
index ad06e40,dd08810..4351081
--- a/control.in
+++ b/control.in
@@@ -22,8 -22,8 +22,8 @@@ Build-Conflicts: flex (= 2.5.34-1) [amd
                   qt3-dev-tools,
                   amd-libopencl1,
                   nvidia-libopencl1
- Standards-Version: 3.9.4
- Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.5
+ Standards-Version: 4.0.0
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
++Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
  Bugs: @BUGS@
  Homepage: http://www.libreoffice.org

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