[SCM] vlc/master: Split off video outputs

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 37db4030f9fd1747c7677eb309176b074e34c59f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Oct 15 18:47:15 2016 +0200

    Split off video outputs

diff --git a/debian/control b/debian/control
index 8804c3f..dcfd384 100644
--- a/debian/control
+++ b/debian/control
@@ -144,6 +144,7 @@ Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: vlc-plugin-base (= ${binary:Version}),
          vlc-plugin-qt (= ${binary:Version}),
+         vlc-plugin-video-output (= ${binary:Version}),
          vlc-l10n (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -151,7 +152,8 @@ Recommends: vlc-plugin-notify (= ${binary:Version}),
             vlc-plugin-samba (= ${binary:Version}),
             vlc-plugin-skins2 (= ${binary:Version}),
             vlc-plugin-access-extra (= ${binary:Version}),
-            xdg-utils
+            vlc-plugin-video-splitter (= ${binary:Version}),
+            vlc-plugin-visualization (= ${binary:Version})
 Breaks: vlc-nox (<< 2.2.0~pre2-2~),
         vlc-plugin-pulse (<< 2.2.1-4~)
 Replaces: vlc-nox (<< 2.2.0~pre2-2~),
@@ -291,6 +293,7 @@ Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          vlc-data (= ${source:Version})
+Recommends: xdg-utils
 Suggests: libdvdcss2
 Description: multimedia player and streamer (base plugins)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -315,6 +318,21 @@ Description: multimedia player and streamer (extra access plugins)
  .
  This package contains additional access plugins.
 
+Package: vlc-plugin-video-output
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Enhances: vlc
+Breaks: vlc (<< 2.2.4-7~)
+Replaces: vlc (<< 2.2.4-7~)
+Description: multimedia player and streamer (video output plugins)
+ 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 video output plugins.
+
 Package: vlc-plugin-video-splitter
 Architecture: any
 Multi-Arch: same
diff --git a/debian/vlc.install b/debian/vlc-plugin-video-output.install
old mode 100755
new mode 100644
similarity index 82%
copy from debian/vlc.install
copy to debian/vlc-plugin-video-output.install
index 6319e1f..1f542cf
--- a/debian/vlc.install
+++ b/debian/vlc-plugin-video-output.install
@@ -1,7 +1,3 @@
-#!/bin/bash
-exec python3 $(dirname $0)/filter-plugin.py <<EOF
-usr/bin/qvlc
-usr/bin/svlc
 usr/lib/*/vlc/plugins/video_output/libaa_plugin.so
 usr/lib/*/vlc/plugins/video_output/libcaca_plugin.so
 usr/lib/*/vlc/plugins/video_output/libegl_x11_plugin.so
@@ -13,6 +9,3 @@ 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
 usr/lib/*/vlc/plugins/video_output/libxcb_xv_plugin.so
-usr/share/applications
-usr/share/solid
-EOF
diff --git a/debian/vlc-plugin-video-output.lintian-overrides b/debian/vlc-plugin-video-output.lintian-overrides
new file mode 100644
index 0000000..d4c6855
--- /dev/null
+++ b/debian/vlc-plugin-video-output.lintian-overrides
@@ -0,0 +1,2 @@
+# Hardening compiler flags are correctly passed (bug #695319)
+vlc binary: hardening-no-fortify-functions usr/lib/*/vlc/plugins/*_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
old mode 100755
new mode 100644
index 6319e1f..33849fb
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -1,18 +1,4 @@
-#!/bin/bash
-exec python3 $(dirname $0)/filter-plugin.py <<EOF
 usr/bin/qvlc
 usr/bin/svlc
-usr/lib/*/vlc/plugins/video_output/libaa_plugin.so
-usr/lib/*/vlc/plugins/video_output/libcaca_plugin.so
-usr/lib/*/vlc/plugins/video_output/libegl_x11_plugin.so
-usr/lib/*/vlc/plugins/video_output/libgl_plugin.so
-usr/lib/*/vlc/plugins/video_output/libgles1_plugin.so
-usr/lib/*/vlc/plugins/video_output/libgles2_plugin.so
-usr/lib/*/vlc/plugins/video_output/libglx_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
-usr/lib/*/vlc/plugins/video_output/libxcb_xv_plugin.so
 usr/share/applications
 usr/share/solid
-EOF
diff --git a/debian/vlc.lintian-overrides b/debian/vlc.lintian-overrides
index 56f8f90..8c02be1 100644
--- a/debian/vlc.lintian-overrides
+++ b/debian/vlc.lintian-overrides
@@ -1,4 +1,2 @@
-# The vlc executable is in vlc-nox but the .desktop file is only relevant to vlc(-with-x)
+# The vlc executable is in vlc-bin but the .desktop file is only relevant to vlc(-with-x)
 vlc binary: desktop-command-not-in-package usr/share/applications/vlc.desktop usr/bin/vlc
-# Hardening compiler flags are correctly passed (bug #695319)
-vlc binary: hardening-no-fortify-functions usr/lib/*/vlc/plugins/*_plugin.so

-- 
VLC media player packaging