[libreoffice] 01/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 5f218de16dcf22a3d25c5390472818ac05edb352
Merge: 5a815a1 7a51ebc
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 20 12:32:14 2016 +0200

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

 changelog                                  | 12 ++++
 control                                    |  6 +-
 control.in                                 |  8 +--
 patches/gtk3-use-style-updated-signal.diff | 94 ++++++++++++++++++++++++++++++
 patches/series                             |  2 +-
 patches/xfce-fallback-list.diff            | 27 ---------
 rules                                      |  2 +-
 7 files changed, 111 insertions(+), 40 deletions(-)

diff --cc changelog
index 2763a86,6a41664..abfc54f
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +libreoffice (1:5.2.2~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
+ libreoffice (1:5.2.1-3) unstable; urgency=medium
+ 
+   * debian/patches/gtk3-use-style-updated-signal.diff: backport from master;
+     use style-updated instead of style-set signal. This closes: #837356 and
+     hopefully also closes: #836416 for real.
+   * debian/patches/xfce-fallback-list.diff: remove again, didn't help
+ 
+   * debian/control.in: _really_ remove font depends from libreoffice
+   * debian/rules: adapt SYSTEM_GCJ_VERSION detected for gcj-6 (>= 6.2.0-4)...
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 17 Sep 2016 01:13:20 +0200
+ 
  libreoffice (1:5.2.1-2) unstable; urgency=medium
  
    * debian/rules: install typesizes.h into

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