[SCM] vlc/master: Fix disabling samba plugin in hurd

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f9d9e1447690431894fb99af749f6c7a07e94c75
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Feb 28 16:06:05 2015 +0100

    Fix disabling samba plugin in hurd

diff --git a/debian/rules b/debian/rules
index 9589447..91453e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,7 +90,6 @@ confflags += \
 	--enable-shine \
 	--enable-shout \
 	--enable-skins2 \
-	--enable-smbclient \
 	--enable-speex \
 	--enable-svg \
 	--enable-taglib \
@@ -182,10 +181,10 @@ endif
 
 # 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
@@ -236,14 +235,6 @@ CFLAGS += -mtune=8548
 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)" \

-- 
VLC media player packaging