[SCM] vlc/master: Revert "Do not FTBFS if zsh completion fails to generate"

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 47178c9a64a43dd167f85ec6b60088049d318abd
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jun 11 11:38:27 2016 +0200

    Revert "Do not FTBFS if zsh completion fails to generate"
    
    This reverts commit bf4e79078953f934ef17c7127d26d9ac3253c579.

diff --git a/debian/rules b/debian/rules
index b7bb341..f8f19c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -348,12 +348,9 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	dh_auto_build
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	# Build zsh completion and remove it if it fails.
-	# This is workaround until we find out why it fails on praetorius.
-	( \
-		BUILDDIR=$(CURDIR) \
-		cd extras/analyser && ./zsh_completion.sh \
-	) || rm -f extras/analyser/_zsh
+	# Build zsh completion
+	BUILDDIR=$(CURDIR) \
+	cd extras/analyser && ./zsh_completion.sh
 endif
 
 override_dh_auto_test:
@@ -398,9 +395,8 @@ ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 			echo warning: $$file depends on libX11 or libxcb; \
 		fi; \
 	done; \
-	# Install zsh completion if available
-	find extras/analyser/_vlc -exec \
-		dh_install -pvlc-nox '{}' usr/share/zsh/vendor-completions \;
+	# Install zsh completion
+	dh_install -pvlc-nox extras/analyser/_vlc usr/share/zsh/vendor-completions
 endif
 	$(if $(shell dpkg-vendor --is Ubuntu && echo true),dh_install -pvlc-nox debian/source_vlc.py usr/share/apport/package-hooks/)
 	dh_buildinfo -p vlc-nox

-- 
VLC media player packaging