[SCM] VLC media player packaging branch, sid, updated. debian/0.9.8a-3-9-g81a509f

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

The following commit has been merged in the sid branch:
commit 8493830afd2217e00775e9642dad3ecaee27e1c5
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Apr 2 23:14:08 2009 +0200

    Move the caca module to vlc-nox
    
    Closes: #522040

diff --git a/debian/control b/debian/control
index f1c7dcf..bdbfad5 100644
--- a/debian/control
+++ b/debian/control
@@ -136,6 +136,8 @@ Section: video
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Replaces: vlc (<< 0.9.8a-3)
+Conflicts: vlc (<< 0.9.8a-3)
 Provides: mp3-decoder
 Description: multimedia player and streamer (without X support)
  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 9a3cfe9..6f7da8f 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -128,6 +128,7 @@ usr/lib/vlc/video_filter/libswscale_plugin.so
 usr/lib/vlc/video_filter/libtransform_plugin.so
 usr/lib/vlc/video_filter/libwall_plugin.so
 usr/lib/vlc/video_filter/libwave_plugin.so
+usr/lib/vlc/video_output/libcaca_plugin.so
 usr/lib/vlc/video_output/libimage_plugin.so
 usr/lib/vlc/video_output/libvmem_plugin.so
 usr/lib/vlc/visualization/libvisual_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index 6143251..0cc0a05 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -8,7 +8,6 @@ usr/lib/vlc/misc/libnotify_plugin.so
 usr/lib/vlc/misc/libscreensaver_plugin.so
 usr/lib/vlc/video_filter/libpanoramix_plugin.so
 usr/lib/vlc/video_output/libaa_plugin.so
-usr/lib/vlc/video_output/libcaca_plugin.so
 usr/lib/vlc/video_output/libglx_plugin.so
 usr/lib/vlc/video_output/libopengl_plugin.so
 usr/lib/vlc/video_output/libx11_plugin.so

-- 
VLC media player packaging