[libreoffice] 03/03: remove obsolete substvars, make them unconditional

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit d42bbca7e5d47030089af70eeae9eca30e9f8754
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue May 30 22:06:06 2017 +0200

    remove obsolete substvars, make them unconditional
---
 rules | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules b/rules
index d2d5ba6..b25c1fb 100755
--- a/rules
+++ b/rules
@@ -874,8 +874,6 @@ else
 	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER), libbz2-dev
 endif
 
-	OPENCL_SUGGESTS := ocl-icd-libopencl1
-
 ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
 	SMALL_SYMBOLS = n
 else
@@ -883,7 +881,6 @@ else
 	SMALL_SYMBOLS = n
   endif
 endif
-	PYTHON_SIX_RECOMMENDS = python3-six
 
 ifeq "$(ENABLE_SYMBOLS)" "y"
   # Small symbols?
@@ -3387,9 +3384,7 @@ endif
 		-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
 		-V'pyuno-depends=$(PYUNO_DEPENDS)' \
 		-V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \
-		-V'opencl-sug=$(OPENCL_SUGGESTS)' \
 		-V'gnome-gtk-recommends=$(GNOME_GTK_RECOMMENDS)' \
-		-V'python-six-recommends=$(PYTHON_SIX_RECOMMENDS)' \
 		-V'firebird-engine-depends=$(FIREBIRD_ENGINE_DEPENDS)' \
 		-v$(BINARY_VERSION)
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
@@ -3405,7 +3400,7 @@ endif
 		-v"`echo $(BINARY_VERSION) | cut -d: -f2`"
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	for i in libreoffice-core libreoffice-writer uno-libs3; do \
-		perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, $(PYTHON_SIX_RECOMMENDS)/' \
+		perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, python3-six/' \
 		debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \
 	done
 endif

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