[libreoffice] 01/03: 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 f0167d106bb5bf9b895793c5bbb070ed0beb07fb
Merge: 0470062 815e239
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jun 5 13:23:39 2017 +0200

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

 README.Debian                        |  4 +-
 changelog                            | 20 ++++++++--
 control                              |  4 +-
 control.in                           |  2 +-
 libreoffice-common.lintian-overrides |  2 +
 libreoffice-core.lintian-overrides   |  1 +
 rules                                | 75 ++++++++++++++++++++++++------------
 7 files changed, 73 insertions(+), 35 deletions(-)

diff --cc changelog
index f6a5870,eaf9e23..977f052
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,6 +1,12 @@@
 +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) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta2~git20170603-1) UNRELEASED; urgency=medium
  
-   * New upstream beta release
+   * New upstream snapshot
      - is now able to do "insert->image, choose pdf". Not insert->docunent
        but close enough, so this closes: #814598
        (unfortunately only using internal pdfium. sigh.)
diff --cc control
index 37a2a63,78639a0..24bce53
--- a/control
+++ b/control
@@@ -188,9 -188,9 +188,9 @@@ 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.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: mailto:debian-openoffice at lists.debian.org
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice

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