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

[Rene Engelhard <rene@moszumanska.debian.org>]

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

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

commit da95373541c2038a84e77ef262cf84fe05c7b7da
Merge: bb9ffa8 88a5c63
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Apr 8 07:56:14 2016 +0200

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

 changelog                    | 12 +++++++++++-
 control                      |  1 +
 libreoffice-gtk3.maintscript |  1 +
 patches/liborcus-0.11.diff   | 15 +++++++++++++++
 rules                        | 16 ++++++++++++----
 shlibs.override.orcus        |  4 ++--
 source/include-binaries      |  1 +
 tests/control                |  2 +-
 tests/sdk-examples           | 18 +++++++++++-------
 9 files changed, 55 insertions(+), 15 deletions(-)

diff --cc changelog
index 7581c9b,6162c7d..576227e
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +libreoffice (1:5.1.3~rc1~git20160404-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@debian.org>  Sat, 02 Apr 2016 12:48:35 +0200
 +
+ libreoffice (1:5.1.2-2) unstable; urgency=medium
+ 
+   * debian/rules:
+     - add boost-filesystem build-dependency... 
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 08 Apr 2016 07:18:09 +0200
+ 
  libreoffice (1:5.1.2-1) unstable; urgency=medium
  
    * New upstream release

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