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

[Rene Engelhard]

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

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

commit c84ed7c0a93c11ae2cb3a122d13c700a16f9666f
Merge: a3dce84 83cb001
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Oct 14 18:16:34 2017 +0200

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

 changelog                               | 10 ++++++++++
 libreoffice-base.lintian-overrides      |  3 ---
 libreoffice-calc.lintian-overrides      |  3 ---
 libreoffice-draw.lintian-overrides      |  3 ---
 libreoffice-impress.lintian-overrides   |  3 ---
 libreoffice-math.lintian-overrides      |  3 ---
 libreoffice-nlpsolver.lintian-overrides |  1 +
 libreoffice-writer.lintian-overrides    |  3 ---
 rules                                   | 15 +++++++++++----
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --cc changelog
index 78abbc4,b924560..0927c14
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,13 +1,31 @@@
 +libreoffice (1:6.0.0~alpha0~git20171013-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  * debian/rules:
 +    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
 +      and in 6.0 the feature is not completely removed yet but the UI for
 +      setting it is already gone anyway....
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
+ libreoffice (1:5.4.2-4) UNRELEASED; urgency=medium
+ 
+   * debian/rules:
+     - *really* fix -dbgsym 0775 permissions by manually fixing them after
+       mkdir -p's (dh_fixperms doesn't run on -dbgsym) which apparently
+       create them as 775 (at least on the buildds)
+     - fix libreoffice-dev-doc.doc-base.lo-idl-ref (again)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 14 Oct 2017 17:07:02 +0200
+ 
  libreoffice (1:5.4.2-3) unstable; urgency=medium
  
    * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert

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