[SCM] VLC media player packaging branch, sid, updated. debian/1.0.4-1-7-g2a65acf

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

The following commit has been merged in the sid branch:
commit 2a65acfc7929745355c9f4b9aeaab281086dc6ea
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Tue Jan 5 21:05:07 2010 +0100

    Disable access_dv on non-Linux archs
    
    The state of lib{raw,avc}1394 on non Linux archs doesn't seems too good.
    So disable the module to have the packages built

diff --git a/debian/control b/debian/control
index 8f0aeb1..595d437 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 7),
                libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libass-dev (>= 0.9.5-2),
                libavahi-client-dev,
-               libavc1394-dev,
+               libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libavcodec-dev (>= 0.cvs20060823),
                libavformat-dev (>= 0.cvs20060823),
                libcaca-dev (>= 0.99.beta4),
@@ -54,7 +54,7 @@ Build-Depends: debhelper (>= 7),
                libpostproc-dev (>= 0.cvs20060823),
                libpulse-dev,
                libqt4-dev,
-               libraw1394-dev,
+               libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                librsvg2-dev,
                libschroedinger-dev (>= 1.0.7-1~),
                libsdl-image1.2-dev,
diff --git a/debian/rules b/debian/rules
index d39a41c..49d7162 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,6 @@ confflags += \
 	--enable-bonjour \
 	--enable-caca \
 	--enable-dca \
-	--enable-dv \
 	--enable-dvb \
 	--enable-dvbpsi \
 	--enable-dvdnav \
@@ -106,6 +105,7 @@ confflags += \
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 confflags += \
 	     --enable-alsa \
+	     --enable-dv \
 	     --enable-pvr \
 	     --enable-v4l \
 	     --enable-v4l2 \
@@ -172,7 +172,7 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	sed -e '/\(lib\|libaccess_\)\(alsa\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
+	sed -e '/\(lib\|libaccess_\)\(alsa\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
 	 debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
 	sed -e '/\(lib\|libaccess_\)\(probe_hal\)_/d' \
 	 debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd

-- 
VLC media player packaging