[SCM] VLC media player packaging branch, sid, updated. debian/0.8.6.h-5-21-g559a165

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 559a165e041c301545179a6eeda00729e1a3f487
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sun Feb 22 22:16:31 2009 +0000

    Disable the DV access module until it's ported to the new API

diff --git a/debian/control b/debian/control
index 3525fb2..7e8b055 100644
--- a/debian/control
+++ b/debian/control
@@ -21,12 +21,10 @@ Build-Depends: debhelper (>= 6),
                libass-dev (>= 0.9.5-2),
                libaudiofile-dev,
                libavahi-client-dev,
-               libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libavcodec-dev (>= 0.cvs20060823),
                libavformat-dev (>= 0.cvs20060823),
                libcaca-dev (>= 0.99.beta4),
                libcdio-dev,
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libdca-dev,
                libdvbpsi4-dev,
                libdvdnav-dev,
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index c6683d7..f197754
--- a/debian/rules
+++ b/debian/rules
@@ -100,13 +100,14 @@ confflags += \
 	--enable-libass \
 	--enable-libdca \
 	--enable-realrtsp \
+	--disable-dv \
 	$(NULL)
 
 #	--enable-dts \
 
 # Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-confflags += --enable-alsa --enable-dv --enable-v4l --enable-v4l2 --enable-pvr
+confflags += --enable-alsa --enable-v4l --enable-v4l2 --enable-pvr
 endif
 
 # svgalib is only for x86 and x86-64 on Linux
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 2a2be7a..9a3cfe9 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -4,7 +4,6 @@ usr/bin/rvlc
 usr/bin/vlc
 usr/bin/vlc-wrapper
 usr/lib/vlc/access/libaccess_directory_plugin.so
-usr/lib/vlc/access/libaccess_dv_plugin.so
 usr/lib/vlc/access/libaccess_fake_plugin.so
 usr/lib/vlc/access/libaccess_file_plugin.so
 usr/lib/vlc/access/libaccess_ftp_plugin.so

-- 
VLC media player packaging