[SCM] vlc/master: Move svlc and qvlc to plugin packages

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 851bbdd1cdfdc1aa8772a00c0f90483d63e0e37b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Nov 22 09:00:00 2016 +0100

    Move svlc and qvlc to plugin packages
    
    Closes: #841530

diff --git a/debian/control b/debian/control
index 3989781..9416325 100644
--- a/debian/control
+++ b/debian/control
@@ -165,16 +165,17 @@ Description: multimedia player and streamer
  for broadcasting purposes or for movie format transformations. Support for
  most output methods is provided by this package, but features can be added by
  installing additional plugins:
+  * vlc-plugin-access-extra
   * vlc-plugin-fluidsynth
   * vlc-plugin-jack
   * vlc-plugin-notify
   * vlc-plugin-samba
   * vlc-plugin-sdl
+  * vlc-plugin-skins2
   * vlc-plugin-svg
-  * vlc-plugin-zvbi
-  * vlc-plugin-access-extra
   * vlc-plugin-video-splitter
   * vlc-plugin-visualization
+  * vlc-plugin-zvbi
 
 Package: libvlc-dev
 Section: libdevel
@@ -366,9 +367,10 @@ Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          fonts-freefont-ttf
+Recommends: vlc-bin
 Enhances: vlc
-Breaks: vlc-data (<< 2.2.4-7~)
-Replaces: vlc-data (<< 2.2.4-7~)
+Breaks: vlc (<< 2.2.4-10~), vlc-data (<< 2.2.4-7~)
+Replaces: vlc (<< 2.2.4-10~), vlc-data (<< 2.2.4-7~)
 Description: multimedia player and streamer (Skins2 plugin)
  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,
@@ -380,9 +382,10 @@ Package: vlc-plugin-qt
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Breaks: vlc (<< 2.2.4-7~)
-Replaces: vlc (<< 2.2.4-7~)
+         ${shlibs:Depends}
+Recommends: vlc-bin
+Breaks: vlc (<< 2.2.4-10~)
+Replaces: vlc (<< 2.2.4-10~)
 Description: multimedia player and streamer (Qt plugin)
  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,
diff --git a/debian/vlc-plugin-qt.install b/debian/vlc-plugin-qt.install
index 0e50df6..1c994c1 100644
--- a/debian/vlc-plugin-qt.install
+++ b/debian/vlc-plugin-qt.install
@@ -1 +1,2 @@
+usr/bin/qvlc
 usr/lib/*/vlc/plugins/gui/libqt4_plugin.so
diff --git a/debian/vlc.links b/debian/vlc-plugin-qt.links
similarity index 50%
copy from debian/vlc.links
copy to debian/vlc-plugin-qt.links
index a406a23..174eae1 100644
--- a/debian/vlc.links
+++ b/debian/vlc-plugin-qt.links
@@ -1,2 +1 @@
-/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/qvlc.1.gz
diff --git a/debian/vlc-plugin-skins2.install b/debian/vlc-plugin-skins2.install
index 1e367d2..bf3c311 100644
--- a/debian/vlc-plugin-skins2.install
+++ b/debian/vlc-plugin-skins2.install
@@ -1,2 +1,3 @@
+usr/bin/svlc
 usr/lib/*/vlc/plugins/gui/libskins2_plugin.so
 usr/share/vlc/skins2
diff --git a/debian/vlc.links b/debian/vlc-plugin-skins2.links
similarity index 50%
rename from debian/vlc.links
rename to debian/vlc-plugin-skins2.links
index a406a23..5faf4ad 100644
--- a/debian/vlc.links
+++ b/debian/vlc-plugin-skins2.links
@@ -1,2 +1 @@
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
-/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/qvlc.1.gz
diff --git a/debian/vlc.install b/debian/vlc.install
index 33849fb..6d3ef7f 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -1,4 +1,2 @@
-usr/bin/qvlc
-usr/bin/svlc
 usr/share/applications
 usr/share/solid

-- 
VLC media player packaging