[SCM] vlc/experimental: Merge zvbi plugin package into base

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 751a3b25830e0304fb857d683fad5eb6294cdc37
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Oct 14 12:57:50 2017 +0200

    Merge zvbi plugin package into base
    
    ffmpeg already links against zvbi

diff --git a/debian/control b/debian/control
index 8369213..8cea024 100644
--- a/debian/control
+++ b/debian/control
@@ -168,7 +168,6 @@ Description: multimedia player and streamer
   * vlc-plugin-svg
   * vlc-plugin-video-splitter
   * vlc-plugin-visualization
-  * vlc-plugin-zvbi
 
 Package: libvlc-dev
 Section: libdevel
@@ -455,21 +454,6 @@ Description: SVG plugin for VLC
  sent non-SVG data, it will convert it to SVG using a template that can be
  specified by the svg-template-file option.
 
-Package: vlc-plugin-zvbi
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${vlc:PluginABI}
-Enhances: vlc
-Description: VBI teletext plugin for VLC
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
- DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
- podcasts, and multimedia streams from various network sources.
- .
- This plugin adds support for VBI teletext to the VLC media player.
-
 Package: vlc-plugin-samba
 Architecture: kfreebsd-any linux-any
 Multi-Arch: same
diff --git a/debian/rules b/debian/rules
index bfbbeee..64c9d6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ pluginpackages += svg
 pluginpackages += video-output
 pluginpackages += video-splitter
 pluginpackages += visualization
-pluginpackages += zvbi
 
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 confflags += --enable-debug
diff --git a/debian/vlc-plugin-base.install b/debian/vlc-plugin-base.install
index 79fa3f9..2057f9c 100755
--- a/debian/vlc-plugin-base.install
+++ b/debian/vlc-plugin-base.install
@@ -105,6 +105,7 @@ usr/lib/*/vlc/plugins/codec/libvorbis_plugin.so
 usr/lib/*/vlc/plugins/codec/libx264_plugin.so
 usr/lib/*/vlc/plugins/codec/libx265_plugin.so
 usr/lib/*/vlc/plugins/codec/libxwd_plugin.so
+usr/lib/*/vlc/plugins/codec/libzvbi_plugin.so
 usr/lib/*/vlc/plugins/control/libdbus_plugin.so
 usr/lib/*/vlc/plugins/control/libdummy_plugin.so
 usr/lib/*/vlc/plugins/control/libgestures_plugin.so
diff --git a/debian/vlc-plugin-zvbi.install b/debian/vlc-plugin-zvbi.install
deleted file mode 100644
index 1ed9798..0000000
--- a/debian/vlc-plugin-zvbi.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/vlc/plugins/codec/libzvbi_plugin.so

-- 
VLC media player packaging