[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 1ac9c6df3b112dbfac5f5280bfe80be5cb5866a8
Merge: 2451879 160140f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 11 19:28:44 2017 +0200

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

 changelog           | 16 ++++++++++++++
 control             |  2 ++
 rules               | 60 ++++++++++++++++++++---------------------------------
 scripts/gsistat.py  | 59 ----------------------------------------------------
 scripts/stat_pos.sh | 32 ++++++++++++++++++++++++++++
 5 files changed, 73 insertions(+), 96 deletions(-)

diff --cc changelog
index b8802e4,8b06c55..4929fc4
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,19 +1,25 @@@
 +libreoffice (1:5.4.2~rc1~git20170830-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 30 Aug 2017 20:46:06 +0200
 +
+ libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
+ 
+   * debian/patches/make-helpimg-not-selectable-as-iconset.diff: as name
+     says, from libreoffice-5-4 branch (closes: #874196)
+ 
+   * debian/rules:
+     - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
+       gets honoured and make libwps/libmwaw internal unconditionally
+       (RUN_MAKE_CHECK=n on BE archs)...
+     - add build-depdendencies on ah-autoreconf and dh-strip-nondeterminism 
+       to please lintian and its inconsequence
+     - move images_helpimg.zip to usr/share like the others; remove obsolete
+       helpimg mangling in the "other" images_*.zip
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 31 Aug 2017 20:05:39 +0000
+ 
  libreoffice (1:5.4.1-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