[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.

commit 04700625b34442516461257aa3fe48e178b1b308
Merge: 657d96a 039dc19
Author: Rene Engelhard <rene at debian.org>
Date:   Sat May 27 13:27:16 2017 +0200

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

 changelog                   | 15 ++++++++++++---
 control                     |  2 +-
 control.in                  |  2 +-
 patches/sensible-lomua.diff |  6 ++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --cc changelog
index 1ff5f7b,2908823..f6a5870
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.5.0~alpha0~git20170527-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~beta1-1) experimental; urgency=medium
+ libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
  
    * New upstream beta release
      - is now able to do "insert->image, choose pdf". Not insert->docunent
diff --cc control
index 3b0be68,b51ee9f..37a2a63
--- a/control
+++ b/control
@@@ -188,7 -188,7 +188,7 @@@ Build-Conflicts: amd-libopencl1
                   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.3
 -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-5.5
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
  Bugs: 
  Homepage: http://www.libreoffice.org
diff --cc control.in
index 7bac36b,e08a4d7..ccff2d6
--- a/control.in
+++ b/control.in
@@@ -23,7 -23,7 +23,7 @@@ Build-Conflicts: flex (= 2.5.34-1) [amd
                   amd-libopencl1,
                   nvidia-libopencl1
  Standards-Version: 3.9.4
- Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
 -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-5.5
  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