[libreoffice] 02/04: Don't call get_libvlc_dep.sh unconditionally

[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 1a6db6d7efefb3f2ec837ba85b0e981d5caf59bf
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon Jul 24 13:02:49 2017 +0200

    Don't call get_libvlc_dep.sh unconditionally
---
 control.in | 2 +-
 rules      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/control.in b/control.in
index a8588c5..c94664c 100644
--- a/control.in
+++ b/control.in
@@ -631,7 +631,7 @@ Description: GStreamer backend for LibreOffice
 Package: libreoffice-avmedia-backend-vlc
 Section: misc
 Architecture: %OOO_ARCHS%
-Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}, ${libvlc-dep} (>= 2.0.8)
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}, ${libvlc-dep}
 Provides: libreoffice-avmedia-backend
 Description: VLC backend for LibreOffice
  LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index 57b3e24..de25b24 100755
--- a/rules
+++ b/rules
@@ -1478,7 +1478,8 @@ endif
 
 ifeq "$(USE_VLC)" "y"
 	CONFIGURE_FLAGS += --enable-vlc
-	BUILD_DEPS += , $(shell debian/scripts/get_libvlc_dep.sh)
+	LIBVLC_DEP = $(shell debian/scripts/get_libvlc_dep.sh) (>= 2.0.8)
+	BUILD_DEPS += , $(LIBVLC_DEP)
   ifeq "$(AVMEDIA_BE_DEPENDS)" ""
 	AVMEDIA_BE_DEPENDS += , libreoffice-avmedia-backend-vlc
   else
@@ -3427,7 +3428,7 @@ endif
 		-V'lpsolve-dep=$(LPSOLVE_DEP)' \
 		-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
 		-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
-		-V'libvlc-dep=$(shell debian/scripts/get_libvlc_dep.sh)' \
+		-V'libvlc-dep=$(LIBVLC_DEP)' \
 		-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
 		-V'pyuno-depends=$(PYUNO_DEPENDS)' \
 		-V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \

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