[libreoffice] 02/02: 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 35ab9294bc7c4f494533ac3414b7dfc18b60f1e9
Merge: d7c857a 8ccd1ff
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 23:00:23 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	changelog
    	control
    	rules
    	tests/control

 changelog     | 19 ++++++++++---------
 control       |  5 +++--
 rules         |  8 ++++----
 tests/control |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --cc changelog
index 963ff77,787165f..3f5cc4c
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,4 +1,14 @@@
 +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/no-openssl.diff: don't uselessly check for openssl and
-     don't require openssl in postgresql-sdbc-impl, not (directly) used
-   * dbeian/rules:
-     - enable mysql-connector again now that libmysqlcppconn _and_
-       mysql-workbench are built against mariadb.
-       Bump (Build-)Dependency on libmysqlcppconn to >= 1.1.7-3 to go sure
- 
 + -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 +
- libreoffice (1:5.2.3-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.3-1) unstable; urgency=medium
  
    * LibreOffice 5.2.3 final release (identical to rc3) 
  
diff --cc control
index 2204aab,1b3d2d0..4263207
--- a/control
+++ b/control
@@@ -185,7 -186,7 +186,7 @@@ Build-Conflicts: amd-libopencl1
  Standards-Version: 3.9.4
  Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
  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