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

[Rene Engelhard]

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

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

commit b89604c583c1f0dbaebbc8782501e60b1747b950
Merge: 435668c 71a4990
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 07:05:35 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	changelog
    	patches/series

 changelog  | 15 +++++++++++++--
 control    |  3 ++-
 control.in |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --cc changelog
index 5059362,6f14d00..c4b136e
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,16 +1,29 @@@
 +libreoffice (1:5.2.4~rc1~git20161025-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +    - fixes (experimental) Gtk print dialog crash (closes: #839701)
 +    - fixes copy paste cells between two tables of two documents with Gtk3
 +      (closes: #834622)
 +    - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
 +
-   * debian/patches/show-vcl-backend-in-about.diff: as name says; backport from
-     master
 +  * debian/patches/no-openssl.diff: don't uselessly check for openssl and
 +    don't require openssl in postgresql-sdbc-impl, not (directly) used
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 +
+ libreoffice (1:5.2.3-1) UNRELEASED; urgency=medium
+ 
+   * LibreOffice 5.2.3 final release (identical to rc3) 
+ 
+   * debian/patches/show-vcl-backend-in-about.diff: as name says; backport from
+     master
+ 
+   * debian/control.in:
+     - add Breaks: browser-plugin-libreoffice to libreoffice-core
+       (closes: #843980)
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 03 Nov 2016 19:18:20 +0100
+ 
  libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
  
    * New upstream release candidate

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