[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 fcc91c696464998f67054fe2da37ebcf88e0e440
Merge: cbd1e77 427fb36
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 1 06:50:09 2016 +0100

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

 changelog                                          | 15 +++++++++
 control                                            |  4 +--
 control.in                                         |  3 +-
 ...uild.diff => build-against-shared-lpsolve.diff} |  0
 patches/fix-system-lpsolve-build.diff              | 39 ++++++++++++----------
 patches/series                                     |  3 +-
 6 files changed, 40 insertions(+), 24 deletions(-)

diff --cc changelog
index e779ea0,80d15d8..ce8b352
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,18 +1,28 @@@
 +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)
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 +
+ libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/fix-system-lpsolve-build.diff: rename to ..
+   * build-against-shared-lpsolve.diff: ... this to make the purpose more clear
+   * debian/patches/fix-system-lpsolve-build.diff: add new one adding
+     -llpsolve55_pic test/linkage (disabled)
+ 
+   * debian/control.in:
+     - remove -sdbc-firebird Recommends: in -base-drivers
+       (closes: #842316, #841253) and the mentioning from the Desciption
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 31 Oct 2016 23:20:33 +0100
+ 
  libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
  
    * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with

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