[SCM] vlc/master: libcaca_plugin.so depends on X11

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

The following commit has been merged in the master branch:
commit 449d17cc6225026cab29f29e9d1e0178452cdb1d
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Fri Jun 29 14:03:45 2012 -0400

    libcaca_plugin.so depends on X11
    
    Error message:
    debian/vlc-nox/usr/lib/vlc/plugins/video_output/libcaca_plugin.so depends on libX11 or libxcb

diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index ca00e40..45de0c9 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -170,7 +170,6 @@ usr/lib/vlc/plugins/video_filter/libtransform_plugin.so
 usr/lib/vlc/plugins/video_filter/libwall_plugin.so
 usr/lib/vlc/plugins/video_filter/libwave_plugin.so
 usr/lib/vlc/plugins/video_filter/libyuvp_plugin.so
-usr/lib/vlc/plugins/video_output/libcaca_plugin.so
 usr/lib/vlc/plugins/video_output/libfb_plugin.so
 usr/lib/vlc/plugins/video_output/libvdummy_plugin.so
 usr/lib/vlc/plugins/video_output/libvmem_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index 134590f..3fcd72a 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -11,6 +11,7 @@ usr/lib/vlc/plugins/misc/libxscreensaver_plugin.so
 usr/lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
 usr/lib/vlc/plugins/video_filter/libpanoramix_plugin.so
 usr/lib/vlc/plugins/video_output/libaa_plugin.so
+usr/lib/vlc/plugins/video_output/libcaca_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_glx_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_window_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_x11_plugin.so

-- 
VLC media player packaging