[libreoffice] 03/03: one more debhelper -N fix (subsequentcheckbase), apparently the findstring thing doesn't work

[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 52db0a2709a5ec1b88b66a1e2cd0cef41a6f4dc3
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 6 21:48:55 2017 +0000

    one more debhelper -N fix (subsequentcheckbase), apparently the findstring thing doesn't work
---
 rules | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rules b/rules
index 4705297..b28a8de 100755
--- a/rules
+++ b/rules
@@ -685,11 +685,9 @@ 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]
@@ -1831,11 +1829,7 @@ endif
 ifeq "$(ENABLE_EVO2)" "y"
 	cat debian/control.evolution.in >> debian/control
 endif
-ifeq "$(BUILD_TEST_PACKAGE)" "y"
-  ifneq "$(OOO_JAVA_ARCHS)" ""
 	cat debian/control.subsequentcheckbase.in >> debian/control
-  endif
-endif
 ifeq "$(PACKAGE_LIBRELOGO)" "y"
 	cat debian/control.librelogo.in >> debian/control
 endif

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