[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 0f67e1fbb0e004c37323b2c6a92228437578ba09
Merge: ae5fab8 b6a4d06
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 21 19:10:47 2017 +0100

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

 changelog |  3 +++
 rules     | 14 ++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --cc changelog
index ea30d19,61bc39b..2cda284
--- a/changelog
+++ b/changelog
@@@ -17,6 -37,8 +17,9 @@@ libreoffice (1:6.0.0~beta1~git20171120-
      - stop passing --disable-database-connectivity for no-Base archs
        (closes: #874274)
      - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
 -    - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
 -      Java9 in reportbuilder) 
++    - replace some manual dpkg-parsechangelog calls with
++      $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
++      --disable-dependency-tracking
    * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
      $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
    * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
diff --cc rules
index e002c01,ffdf806..8ef7ffd
--- a/rules
+++ b/rules
@@@ -695,9 -704,9 +698,9 @@@ endi
  # Distro-specific overrides
  
  # Debian Stretch
- ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
+ ifeq "$(DEB_DISTRIBUTION)" "stretch-backports"
    BUGS=mailto:debian-backports at lists.debian.org
 -  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec,$(SYSTEM_STUFF))
 +  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus 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))

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