[SCM] vlc/master: v4l is gone from the kernel. Build only v4l2.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fffe02ff787abce8c2d597f8574d275793bbf442
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Feb 1 12:20:06 2011 +0100

    v4l is gone from the kernel. Build only v4l2.

diff --git a/debian/rules b/debian/rules
index ea47994..94cc178 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,7 +120,6 @@ confflags += \
 	--enable-libva \
 	--enable-pvr \
 	--enable-udev \
-	--enable-v4l \
 	--enable-v4l2 \
 	$(NULL)
 endif
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 3a29c16..367ce17 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -30,7 +30,6 @@ usr/lib/vlc/plugins/access/libfilesystem_plugin.so
 usr/lib/vlc/plugins/access/libpvr_plugin.so
 usr/lib/vlc/plugins/access/librtp_plugin.so
 usr/lib/vlc/plugins/access/libv4l2_plugin.so
-usr/lib/vlc/plugins/access/libv4l_plugin.so
 usr/lib/vlc/plugins/access/libvcd_plugin.so
 usr/lib/vlc/plugins/access/libvcdx_plugin.so
 usr/lib/vlc/plugins/access/libzip_plugin.so

-- 
VLC media player packaging