[SCM] vlc/master: Revert "Enable and build sftp plugin and add it to vlc-nox."

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5704a803a456e0609e26f4e10f8ca5fcbdb054a6
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Oct 4 19:36:29 2012 +0200

    Revert "Enable and build sftp plugin and add it to vlc-nox."
    
    This reverts commit ebfad0ec5846f57105e000751f9fe4c43005f857.
    
    Enabling the sftp plugin will be deferred to a later upload to not interfere
    with RC bug fixes.

diff --git a/debian/control b/debian/control
index 3032656..ba58d9f 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,6 @@ Build-Depends: autopoint,
                libsmbclient-dev,
                libspeex-dev (>= 1.0.5),
                libspeexdsp-dev (>= 1.0.5),
-               libssh2-1-dev,
                libsvga1-dev [amd64 i386],
                libswscale-dev (>= 4:0.6),
                libtag1-dev (>= 1.5),
diff --git a/debian/rules b/debian/rules
index acbd8ed..c605f1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,6 @@ confflags += \
 	--enable-samplerate \
 	--enable-schroedinger \
 	--enable-sdl \
-	--enable-sftp \
 	--enable-shout \
 	--enable-skins2 \
 	--enable-smb \
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index b5a9df4..7d6f635 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -18,7 +18,6 @@ usr/lib/vlc/plugins/access/libaccess_mtp_plugin.so
 usr/lib/vlc/plugins/access/libaccess_oss_plugin.so
 usr/lib/vlc/plugins/access/libaccess_rar_plugin.so
 usr/lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
-usr/lib/vlc/plugins/access/libaccess_sftp_plugin.so
 usr/lib/vlc/plugins/access/libaccess_shm_plugin.so
 usr/lib/vlc/plugins/access/libaccess_smb_plugin.so
 usr/lib/vlc/plugins/access/libaccess_tcp_plugin.so

-- 
VLC media player packaging