[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 52a524c785b3299786f0eb9762c5f91375d22d7d
Merge: 1c0d377 37e8abb
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 20 23:28:54 2016 +0200

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

 changelog                                      |   9 ++
 patches/gtk3-lot-of-style-updated-signals.diff | 134 +++++++++++++++++++++++++
 patches/series                                 |   1 +
 3 files changed, 144 insertions(+)

diff --cc changelog
index 5caa53b,1100b57..3dcd738
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,12 +1,18 @@@
 +libreoffice (1:5.2.3~rc1~git20160920-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
+ libreoffice (1:5.2.2~rc1-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/gtk3-lot-of-style-updated-signals.diff: apply follow-up
+     patch to don't throw away font settings every time (see #836531)
+ 
+  -- 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;
diff --cc patches/series
index 8d6d406,900b500..e52f690
--- a/patches/series
+++ b/patches/series
@@@ -30,3 -30,5 +30,4 @@@ rsc-no-error-about-unknown-switch.dif
  debian-branding.diff
  no-packagekit-per-default.diff
  sparc64.diff
 -gtk3-use-style-updated-signal.diff
+ gtk3-lot-of-style-updated-signals.diff

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