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

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

The following commit has been merged in the sid branch:
commit 441be654048ad791a8f4af2a9a14e87b979dd431
Author: Christophe Mutricy <xtophe at altair.v.videolan.org>
Date:   Tue Feb 24 00:24:29 2009 +0100

    Move http/.hosts to /etc (Closes: #501791)

diff --git a/debian/NEWS b/debian/NEWS
index 5f51a79..9e263a4 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,15 @@
+vlc (0.9.8a-2) unstable; urgency=low
+
+  HTTP interface:
+
+   The .hosts file used to control which remote hosts have access to the http
+  interface has been moved to /etc/vlc/http/hosts and is now a conffile.
+   If you do more change to the http interface, you need to do that out of
+  /usr/share/vlc/http and use --http-src option of vlc. If you don't, your
+  modifications will get lost at the next upgrade of vlc.
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Mon, 23 Feb 2009 22:41:46 +0000
+
 vlc (0.9.2-1) experimental; urgency=low
 
   Important changes in this new upstream version:
diff --git a/debian/rules b/debian/rules
index 0f862f7..d0717a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,6 +183,11 @@ install: build
 	mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
 	# Install stuff
 	dh_install -si --fail-missing --sourcedir=debian/tmp
+	# move .hosts
+	mkdir -p debian/vlc-data/etc/vlc/http
+	mv debian/vlc-data/usr/share/vlc/http/.hosts debian/vlc-data/etc/vlc/http
+	ln -s /etc/vlc/http/hosts debian/vlc-data/usr/share/vlc/http/.hosts
+
 	#install BTS stuff
 	mkdir -p  debian/vlc-nox/usr/share/bug/vlc-nox
 	cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox

-- 
VLC media player packaging