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

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

The following commit has been merged in the sid branch:
commit 8bfca08f2325ebc26af18a0038b40cf413e863d3
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Tue Jan 5 13:40:40 2010 +0100

    Start changelog for vlc 1.0.4-2
    
    Note that it build fine but I havent't tested install and upgrade yet.

diff --git a/debian/changelog b/debian/changelog
index 486563b..63a724f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vlc (1.0.4-2~2.gbpc1b35f) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @c1b35fb46615154c281f40851f9831d0070b832e **
+
+  * Report libavutil50 presence the correct way
+  * Move back hotkeys to vlc-nox (Closes: #563477)
+  * Fix Replaces/Conflicts version so that upgrade work (Closes:
+    #563476, #563483)
+  * Add patch taken from upstream to fix jack input with jack2 (Closes:
+    #532339) - thanks to Adrian Knoth
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Mon, 04 Jan 2010 21:47:16 +0100
+
 vlc (1.0.4-1) unstable; urgency=low
 
   * New upstream release

-- 
VLC media player packaging