[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.1-1-29-gee95324

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

The following commit has been merged in the experimental branch:
commit 3a4c5ee7a50c31cfaf237f628cb5992d8b9df38a
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Aug 5 01:42:03 2010 +0200

    Move libavcodec plugin from vlc-nox to vlc.

diff --git a/debian/control b/debian/control
index 36547d6..1b9c438 100644
--- a/debian/control
+++ b/debian/control
@@ -183,8 +183,8 @@ Recommends: vlc-plugin-notify (= ${binary:Version}),
             vlc-plugin-pulse (= ${binary:Version})
 Suggests: mozilla-plugin-vlc,
           videolan-doc
-Breaks: vlc-nox (<< 1.1.2)
-Replaces: vlc-nox (<< 1.1.2)
+Breaks: vlc-nox (<< 1.1.2-1+exp1)
+Replaces: vlc-nox (<< 1.1.2-1+exp1)
 Provides: mp3-decoder
 Description: multimedia player and streamer
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index a05282e..38ddd70 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -44,7 +44,6 @@ usr/lib/vlc/plugins/codec/liba52_plugin.so
 usr/lib/vlc/plugins/codec/libadpcm_plugin.so
 usr/lib/vlc/plugins/codec/libaes3_plugin.so
 usr/lib/vlc/plugins/codec/libaraw_plugin.so
-usr/lib/vlc/plugins/codec/libavcodec_plugin.so
 usr/lib/vlc/plugins/codec/libcc_plugin.so
 usr/lib/vlc/plugins/codec/libcdg_plugin.so
 usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index dcd6b88..f4fadb5 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -1,6 +1,7 @@
 usr/bin/qvlc
 usr/bin/svlc
 usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
+usr/lib/vlc/plugins/codec/libavcodec_plugin.so
 usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.so
 usr/lib/vlc/plugins/gui/libqt4_plugin.so

-- 
VLC media player packaging