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

[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.2
in repository libreoffice.

commit cf22fb28ec797f6bb3ab7c81532594be517dd712
Merge: 72adfe7 9b65a9e
Author: Rene Engelhard <rene@debian.org>
Date:   Thu May 26 20:40:10 2016 +0200

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

 changelog                          | 3 +++
 libreoffice-calc.lintian-overrides | 1 +
 2 files changed, 4 insertions(+)

diff --cc changelog
index 75d0d69,e28a72f..b974503
--- a/changelog
+++ b/changelog
@@@ -23,7 -8,13 +23,10 @@@ libreoffice (1:5.2.0~beta1-1) experimen
      - move GTK3_MINVER setting down in rules so the conditional gets honoured
      - migrate from --ddeb-migration to --dbgsym-migration
  
 -  * debian/source/include-binaries, tarballs/mdds-1.2.0.tar.bz2: add
 -    forgotten mdds-1.2.0.tar.bz2
 -
+   * debian/libreoffice-calc.lintian-overrides: (temporerily) readd
+     libreoffice-calc: binary-or-shlib-defines-rpath override
+ 
 - -- Rene Engelhard <rene@debian.org>  Sat, 14 May 2016 00:18:49 +0200
 + -- Rene Engelhard <rene@debian.org>  Thu, 26 May 2016 20:38:51 +0200
  
  libreoffice (1:5.1.3-1) unstable; urgency=medium
  

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