[SCM] vlc/master: Enable vnc support again

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2f1adf99e5c7ccf5d2fa41deec63a91f62fc78cb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 20 01:01:43 2014 +0200

    Enable vnc support again

diff --git a/debian/control b/debian/control
index 7978a70..0f9fe40 100644
--- a/debian/control
+++ b/debian/control
@@ -95,6 +95,7 @@ Build-Depends: autopoint,
                libva-dev [kfreebsd-any linux-any],
                libvcdinfo-dev (>= 0.7.22),
                libvdpau-dev,
+               libvncserver-dev,
                libvorbis-dev,
                libx11-dev,
                libx264-dev (>= 2:0.86),
diff --git a/debian/rules b/debian/rules
index b1e30a6..84554a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,7 @@ confflags += \
 	--enable-upnp \
 	--enable-vcdx \
 	--enable-vdpau \
+	--enable-vnc \
 	--enable-vorbis \
 	--enable-x264 \
 	--enable-zvbi \
@@ -109,7 +110,6 @@ confflags += \
 # fdkaac -> in Debian non-free
 # gnomevfs -> poorly maintained
 # goom -> not in Debian
-# libvnc -> libvncserver-dev (containing libvncclient) conflicts with gnutls28
 # mfx -> currently not supported on Linux
 # opencv -> developer plugin not required by end users
 # projectm -> broken
@@ -123,7 +123,6 @@ confflags += \
 	--disable-fdkaac \
 	--disable-gnomevfs \
 	--disable-goom \
-	--disable-libvnc \
 	--disable-mfx \
 	--disable-opencv \
 	--disable-projectm \
diff --git a/debian/vlc.install.in b/debian/vlc.install.in
index 86ae774..5250a65 100644
--- a/debian/vlc.install.in
+++ b/debian/vlc.install.in
@@ -3,6 +3,7 @@ usr/bin/svlc
 usr/lib/vlc/libvlc_vdpau.so*
 usr/lib/vlc/plugins/access/libpulsesrc_plugin.so
 usr/lib/vlc/plugins/access/librdp_plugin.so
+usr/lib/vlc/plugins/access/libvnc_plugin.so
 usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
 usr/lib/vlc/plugins/audio_output/libpulse_plugin.so
 usr/lib/vlc/plugins/codec/libsdl_image_plugin.so

-- 
VLC media player packaging