[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-62-g39042ce

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

The following commit has been merged in the experimental branch:
commit 559b02e6d183be8826d627bca1922bd0ea9cdea9
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 24 18:22:30 2010 +0200

    Provide VBI teletext plugin
    
    Closes: #563873
    Thanks: László Benedek <benedekl at gmail.com>

diff --git a/debian/control b/debian/control
index 5e42eb9..b12f45a 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libxml2-dev,
                libxpm-dev,
                libxt-dev,
+               libzvbi-dev,
                lua5.1,
                nasm,
                pkg-config,
@@ -320,6 +321,18 @@ Description: SVG plugin for VLC
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
+Package: vlc-plugin-zvbi
+Architecture: any
+Depends: vlc-nox (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: VBI teletext plugin for VLC
+ This plugin adds support for VBI teletext to the VLC media player.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
 Package: vlc-data
 Depends: ${misc:Depends}
 Architecture: all
diff --git a/debian/rules b/debian/rules
index cec882f..42bb217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,8 @@ confflags += \
 	--disable-mtp \
 	--disable-portaudio \
 	--disable-sqlite \
+	--disable-telx \
 	--disable-x264 \
-	--disable-zvbi \
 	--enable-a52 \
 	--enable-aa \
 	--enable-bonjour \
@@ -89,12 +89,12 @@ confflags += \
 	--enable-speex \
 	--enable-svg \
 	--enable-taglib \
-	--enable-telx \
 	--enable-theora \
 	--enable-twolame \
 	--enable-vcd \
 	--enable-vcdx \
 	--enable-vorbis \
+	--enable-zvbi \
 	--with-kde-solid=/usr/share/kde4/apps/ \
 	--with-mozilla-pkg=libxul \
 	$(NULL)
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 1e8a5a0..81394f5 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -67,7 +67,6 @@ usr/lib/vlc/plugins/codec/libsubsdec_plugin.so
 usr/lib/vlc/plugins/codec/libsubsusf_plugin.so
 usr/lib/vlc/plugins/codec/libsvcdsub_plugin.so
 usr/lib/vlc/plugins/codec/libt140_plugin.so
-usr/lib/vlc/plugins/codec/libtelx_plugin.so
 usr/lib/vlc/plugins/codec/libtheora_plugin.so
 usr/lib/vlc/plugins/codec/libtwolame_plugin.so
 usr/lib/vlc/plugins/codec/libvorbis_plugin.so
diff --git a/debian/vlc-plugin-zvbi.install b/debian/vlc-plugin-zvbi.install
new file mode 100644
index 0000000..c739992
--- /dev/null
+++ b/debian/vlc-plugin-zvbi.install
@@ -0,0 +1 @@
+usr/lib/vlc/plugins/codec/libzvbi_plugin.so
diff --git a/debian/vlc-plugin-zvbi.links b/debian/vlc-plugin-zvbi.links
new file mode 100644
index 0000000..a2d172d
--- /dev/null
+++ b/debian/vlc-plugin-zvbi.links
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-zvbi
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-zvbi

-- 
VLC media player packaging