[SCM] vlc/master: Merge branch 'feature/zsh-completion'

[sramacher at users.alioth.debian.org]

Build zsh completion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0aad8cfed06658b8113b283a6c83757a866191d4
X-Git-Newrev: 1f1c07146224f734f72a66730eb9b20e45d9da8e

The following commit has been merged in the master branch:
commit df8e0582acf17f24d64f82216dd6212f57600feb
Merge: 803dec1ddcf733d08b719c6fc8c19137362277d8 f837c76b40e5663aa212578b1353542b44f49e3f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Apr 25 11:52:38 2015 +0200

    Merge branch 'feature/zsh-completion'

diff --combined debian/control
index f69479e,c81ae49..47355bd
--- a/debian/control
+++ b/debian/control
@@@ -114,11 -114,12 +114,12 @@@ Build-Depends: autopoint
                 lua5.2,
                 oss4-dev [kfreebsd-any],
                 pkg-config,
-                zlib1g-dev
+                zlib1g-dev,
+                zsh
  Standards-Version: 3.9.6
  Homepage: http://www.videolan.org/vlc/
  Vcs-Git: git://anonscm.debian.org/pkg-multimedia/vlc.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/vlc.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/vlc.git
  
  Package: libvlc-dev
  Section: libdevel
@@@ -135,7 -136,7 +136,7 @@@ Description: development files for libv
  Package: libvlc5
  Section: libs
  Architecture: any
 -Depends: ${misc:Depends}, ${shlibs:Depends}
 +Depends: ${misc:Depends}, ${shlibs:Depends}, libvlccore8 (= ${binary:Version})
  Description: multimedia player and streamer library
   This package contains the shared library required by applications using VLC
   features.
diff --combined debian/rules
index df07519,4426454..c8bb8b7
--- a/debian/rules
+++ b/debian/rules
@@@ -63,6 -63,7 +63,6 @@@ confflags += 
  	--enable-fribidi \
  	--enable-gles1 \
  	--enable-gles2 \
 -	--enable-glx \
  	--enable-gnutls \
  	--enable-jack \
  	--enable-kate \
@@@ -91,6 -92,7 +91,6 @@@
  	--enable-shine \
  	--enable-shout \
  	--enable-skins2 \
 -	--enable-smbclient \
  	--enable-speex \
  	--enable-svg \
  	--enable-taglib \
@@@ -183,10 -185,10 +183,10 @@@ endi
  
  # Linux and kFreeBSD specific flags (disabled on Hurd)
  ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
 -confflags += --enable-libva --enable-vcd
 +confflags += --enable-libva --enable-vcd --enable-smbclient
  else
 -confflags += --disable-libva --disable-vcd
 -removeplugins += cdda libvaapi vcd
 +confflags += --disable-libva --disable-vcd --disable-smbclient
 +removeplugins += cdda libvaapi smbclient vcd
  endif
  
  # kFreeBSD specific flags
@@@ -237,6 -239,15 +237,6 @@@ CFLAGS += -mtune=854
  CXXFLAGS += -mtune=8548
  endif
  
 -# Disable samba on hurd
 -ifneq (,$(filter-out $(DEB_HOST_ARCH),hurd-i386))
 -confflags += --enable-smbclient
 -else
 -confflags += --disable-smbclient
 -removeplugins += smbclient
 -endif
 -
 -
  confflags += \
  	CFLAGS="$(CFLAGS)" \
  	CXXFLAGS="$(CXXFLAGS)" \
@@@ -255,6 -266,14 +255,14 @@@ override_dh_auto_clean
  override_dh_auto_configure:
  	dh_auto_configure -- $(confflags)
  
+ 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
+ endif
+ 
  override_dh_auto_test:
  ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
  ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
@@@ -297,6 -316,8 +305,8 @@@ ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST
  		fi; \
  	done; \
  	if test "$$BORKED" = yes; then exit 1; fi
+ 	# 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