[libreoffice] 04/05: do not pass -Nlibreoffice-subsequentcheckbase to dh if it's not in control in the first place (dh fails now with that)

[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 98c283bada50ce9e6dc3a7cc771d58ac882c2187
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Oct 10 14:33:17 2017 +0000

    do not pass -Nlibreoffice-subsequentcheckbase to dh if it's not in control in the first place (dh fails now with that)
---
 rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules b/rules
index 268afaa..9519e82 100755
--- a/rules
+++ b/rules
@@ -666,9 +666,11 @@ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
   endif
 endif
 
+ifneq (,$(findstring libreoffice-subsequentcheckbase,$(ARCH_INDEP_PACKAGES)))
 ifeq "$(BUILD_TEST_PACKAGE)" "n"
 	DEBHELPER_OPTIONS += -Nlibreoffice-subsequentcheckbase
 endif
+endif
 
 ifneq (,$(findstring mips, $(OOO_ARCHS)))
   BUILD_DEPS += , binutils (>= 2.23) [mips mipsel], libc6 (>= 2.17-6) [mips mipsel]

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