[libreoffice] 01/04: make libwps/libmwaw internal unconditionally (RUN_MAKE_CHECK=n on BE archs)...

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 9a77df90578e8447939dc25189d6ac9c00468da2
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Sep 9 13:05:26 2017 +0200

    make libwps/libmwaw internal unconditionally (RUN_MAKE_CHECK=n on BE archs)...
---
 changelog | 3 ++-
 rules     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 324ac33..fbde32d 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,8 @@ libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
 
   * debian/rules:
     - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
-      gets honoured...
+      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 plase lintian and its inconsequence
 
diff --git a/rules b/rules
index f559e3c..964def0 100755
--- a/rules
+++ b/rules
@@ -681,9 +681,9 @@ endif
 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 xmlsec,$(SYSTEM_STUFF))
-  ifeq "$(RUN_MAKE_CHECK)" "y"
-    SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
-  endif
+  # 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