[SCM] VLC media player packaging branch, lucid, updated. debian/1.0.6-1ubuntu1-3-ge5cac67

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

The following commit has been merged in the lucid branch:
commit 49e3a50858c6682d9a7539b412db27041866ee3e
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed May 5 01:32:34 2010 +0200

    Move libx264 plugin from vlc to vlc-nox (LP: #575054).

diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 40cb182..6ab031a 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -67,6 +67,7 @@ usr/lib/vlc/codec/libtelx_plugin.so
 usr/lib/vlc/codec/libtheora_plugin.so
 usr/lib/vlc/codec/libtwolame_plugin.so
 usr/lib/vlc/codec/libvorbis_plugin.so
+usr/lib/vlc/codec/libx264_plugin.so
 usr/lib/vlc/control/libdbus_plugin.so
 usr/lib/vlc/control/libgestures_plugin.so
 usr/lib/vlc/control/libhotkeys_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index 1705c5e..8f5c634 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -2,7 +2,6 @@ usr/bin/qvlc
 usr/bin/svlc
 usr/lib/vlc/access/libx11_screen_plugin.so
 usr/lib/vlc/codec/libsdl_image_plugin.so
-usr/lib/vlc/codec/libx264_plugin.so
 usr/lib/vlc/control/libglobalhotkeys_plugin.so
 usr/lib/vlc/gui/libqt4_plugin.so
 usr/lib/vlc/gui/libskins2_plugin.so

-- 
VLC media player packaging