[SCM] vlc/master: Split off binaries

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d7a1dbcbeef2662fcfc3814c8015154e02d7a4f9
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Oct 12 01:48:23 2016 +0200

    Split off binaries

diff --git a/debian/control b/debian/control
index 9071b56..e997cdb 100644
--- a/debian/control
+++ b/debian/control
@@ -207,6 +207,20 @@ Description: tools for VLC's base library
  .
  This package contains the vlc-cache-gen binary.
 
+Package: vlc-bin
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvlc-bin (= ${binary:Version})
+Breaks: vlc-nox (<< 2.2.4-6~)
+Replaces: vlc-nox (<< 2.2.4-6~)
+Description: binaries from 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 package contains the VLC's binaries.
+
 Package: vlc
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -253,7 +267,8 @@ Package: vlc-nox
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         vlc-bin (= ${binary:Version})
 Suggests: libdvdcss2
 Provides: mp3-decoder
 Description: multimedia player and streamer (without X support)
diff --git a/debian/vlc-bin.install b/debian/vlc-bin.install
new file mode 100644
index 0000000..10900da
--- /dev/null
+++ b/debian/vlc-bin.install
@@ -0,0 +1,6 @@
+usr/bin/cvlc
+usr/bin/nvlc
+usr/bin/rvlc
+usr/bin/vlc
+usr/bin/vlc-wrapper
+usr/share/man
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index a520ac5..bb9305d 100755
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -1,10 +1,5 @@
 #!/bin/bash
 exec python3 $(dirname $0)/filter-plugin.py <<EOF
-usr/bin/cvlc
-usr/bin/nvlc
-usr/bin/rvlc
-usr/bin/vlc
-usr/bin/vlc-wrapper
 usr/lib/vlc/lua/
 usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so [alsa]
 usr/lib/vlc/plugins/access/libaccess_mms_plugin.so
@@ -187,5 +182,4 @@ usr/lib/vlc/plugins/video_output/libfb_plugin.so [fb]
 usr/lib/vlc/plugins/video_output/libvdummy_plugin.so
 usr/lib/vlc/plugins/video_output/libvmem_plugin.so
 usr/lib/vlc/plugins/video_output/libyuv_plugin.so
-usr/share/man
 EOF

-- 
VLC media player packaging