[libreoffice] 03/03: 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 cd28b4ab2f8fcb83d589e8d7ef62a2d301047906
Merge: a74b89a cf7cfdc
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Sep 9 19:37:45 2017 +0200

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

 changelog           | 13 +++++++++++
 control             |  2 ++
 rules               | 62 +++++++++++++++++++++--------------------------------
 scripts/gsistat.py  | 59 --------------------------------------------------
 scripts/stat_pos.sh | 32 +++++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 97 deletions(-)

diff --cc changelog
index 9653a2f,f402919..9f7c411
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,16 +1,34 @@@
 +libreoffice (1:6.0.0~alpha0~git20170903-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.1-2) UNRELEASED; urgency=medium
+ 
+   * 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
diff --cc rules
index d7632a0,3c5158e..639217e
--- a/rules
+++ b/rules
@@@ -687,10 -680,10 +674,10 @@@ endi
  # Debian Stretch
  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
    BUGS=mailto:debian-backports at lists.debian.org
-   SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit mdds xmlsec libqxp,$(SYSTEM_STUFF))
-   ifeq "$(RUN_MAKE_CHECK)" "y"
-     SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
-   endif
 -  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec,$(SYSTEM_STUFF))
++  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec libqxp,$(SYSTEM_STUFF))
+   # needs newer stuff for tests, we can't make it conditional on RUN_MAKE_CHECK since
+   # BE archs don't run them anyway and this wouldn't be in effect...
+   SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
    STRETCH_BACKPORT=y
  endif
  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"

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