[SCM] vlc/experimental: Revert "Disable zsh completion"

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Oct 4 17:48:28 UTC 2017


The following commit has been merged in the experimental branch:
commit 1c7e4546cd1679fbfd29394137882677d4fcb21a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Oct 4 19:46:55 2017 +0200

    Revert "Disable zsh completion"
    
    This reverts commit 45960af5e29053023273ad955dd54020948bff87.

diff --git a/debian/changelog b/debian/changelog
index af660fc..b273d8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,6 @@ vlc (3.0.0~20171004-1) UNRELEASED; urgency=medium
     - Update d/copyright.
     - Check vlc-plugin-* packages and new plugins.
     - Check currently disabled plugins.
-    - zsh completion is currently broken (patches sent upstream).
     - Update Breaks+Replaces for moved plugins.
 
  -- Sebastian Ramacher <sramacher at debian.org>  Mon, 25 Sep 2017 19:53:00 +0200
diff --git a/debian/rules b/debian/rules
index 01b69c3..bfbbeee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -265,8 +265,8 @@ override_dh_auto_build:
 	dh_auto_build
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Build zsh completion
-	# BUILDDIR=$(CURDIR) \
-	# cd extras/analyser && ./zsh_completion.sh
+	BUILDDIR=$(CURDIR) \
+	cd extras/analyser && ./zsh_completion.sh
 endif
 
 override_dh_auto_test:
@@ -304,7 +304,7 @@ override_dh_install:
 	dh_install
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Install zsh completion
-	# dh_install -pvlc-bin extras/analyser/_vlc usr/share/zsh/vendor-completions
+	dh_install -pvlc-bin extras/analyser/_vlc usr/share/zsh/vendor-completions
 endif
 	$(if $(shell dpkg-vendor --is Ubuntu && echo true),dh_install -pvlc-bin debian/source_vlc.py usr/share/apport/package-hooks/)
 	# Create empty directory for plugins.dat

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list