[SCM] VLC media player packaging branch, sid, updated. debian/1.0.1-1-17-g5f5e1a8

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

The following commit has been merged in the sid branch:
commit b86480af4bc314bfb0809ae0b53c85f80b19cd21
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Sep 10 14:27:08 2009 +0200

    Fix kfreebsd FTBFS and simplified
    
    Closes: #545863
    Thanks: Petr Salinger

diff --git a/debian/control b/debian/control
index d2c1582..eb5343e 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends: debhelper (>= 7),
                libgl1-mesa-dev,
                libglib2.0-0,
                libgnutls-dev (>= 1.2.8),
-               libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libhal-dev (>= 0.5.5.1-3) [!hurd-i386],
                libid3tag0-dev,
                libidl0,
                libimlib2-dev,
diff --git a/debian/rules b/debian/rules
index 9e035a9..380b64e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,6 +149,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+	rm -f debian/vlc-nox.install.kfreebsd
 	# Clean VLC
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf tmp/
@@ -168,9 +169,7 @@ install: build
 	dh_testroot
 	dh_prep
 	sed -e '/\(lib\|libaccess_\)\(alsa\|dvb\|v4l\|v4l2\|pvr\)_/d' \
-	 debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd-i386
-	cp debian/vlc-nox.install.kfreebsd-i386 \
-	 debian/vlc-nox.install.kfreebsd-amd64
+	 debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	cp tmp/libvlc.a debian/tmp/usr/lib

-- 
VLC media player packaging