[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 025f6fc33eff594c0bcf068eb580c1e7acfc95f4
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Jan 4 21:02:12 2010 +0100

    Move back hotkeys to vlc-nox
    
    Closes: #563477

diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 2921a31..84b03eb 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -70,6 +70,7 @@ usr/lib/vlc/codec/libtwolame_plugin.so
 usr/lib/vlc/codec/libvorbis_plugin.so
 usr/lib/vlc/control/libdbus_plugin.so
 usr/lib/vlc/control/libgestures_plugin.so
+usr/lib/vlc/control/libhotkeys_plugin.so
 usr/lib/vlc/control/libhttp_plugin.so
 usr/lib/vlc/control/liblirc_plugin.so
 usr/lib/vlc/control/libmotion_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index ef66b30..8f5c634 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -3,7 +3,6 @@ usr/bin/svlc
 usr/lib/vlc/access/libx11_screen_plugin.so
 usr/lib/vlc/codec/libsdl_image_plugin.so
 usr/lib/vlc/control/libglobalhotkeys_plugin.so
-usr/lib/vlc/control/libhotkeys_plugin.so
 usr/lib/vlc/gui/libqt4_plugin.so
 usr/lib/vlc/gui/libskins2_plugin.so
 usr/lib/vlc/misc/libnotify_plugin.so

-- 
VLC media player packaging