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

[Rene Engelhard]

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

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

commit 3312fb8eec5fabfae44324656baaa28f7038e0a3
Merge: de8f2ae 83cb001
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Oct 14 18:29:46 2017 +0200

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

 changelog                               | 17 +++++++++++++++++
 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 ---
 patches/series                          |  1 +
 patches/ww8export-HAVE_MORE_FONTS.diff  | 22 ++++++++++++++++++++++
 rules                                   | 21 +++++++++++----------
 11 files changed, 52 insertions(+), 28 deletions(-)

diff --cc changelog
index f9ee5b9,b924560..5a04f6c
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,20 +1,26 @@@
 +libreoffice (1:5.4.3~rc1~git20171014-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 09 Oct 2017 11:09:52 +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
+     change of -2. Actually doesn't work. (Did in a testbuild, but...)
+ 
+  -- Rene Engelhard <rene at debian.org>  Tue, 10 Oct 2017 21:28:41 +0200
+ 
  libreoffice (1:5.4.2-2) unstable; urgency=medium
  
    * debian/patches/ww8export-HAVE_MORE_FONTS.diff: remove again ...

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