[SCM] vlc/master: Split out vlc-cache-gen

[sramacher at users.alioth.debian.org]

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

    Split out vlc-cache-gen

diff --git a/debian/control b/debian/control
index 7333961..ef41193 100644
--- a/debian/control
+++ b/debian/control
@@ -193,6 +193,19 @@ Description: base library for VLC and its modules
  .
  This package contains the shared library required by VLC modules and libvlc.
 
+Package: libvlc-bin
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: vlc-nox (<< 2.2.4-6~)
+Replaces: vlc-nox (<< 2.2.4-6~)
+Description: tools for VLC's base library
+ 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-cache-gen binary.
+
 Package: vlc
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/libvlc-bin.install b/debian/libvlc-bin.install
new file mode 100644
index 0000000..a40d666
--- /dev/null
+++ b/debian/libvlc-bin.install
@@ -0,0 +1 @@
+usr/lib/vlc/vlc-cache-gen
diff --git a/debian/vlc-nox.postinst b/debian/libvlc-bin.postinst
similarity index 68%
rename from debian/vlc-nox.postinst
rename to debian/libvlc-bin.postinst
index 845c344..8e47187 100644
--- a/debian/vlc-nox.postinst
+++ b/debian/libvlc-bin.postinst
@@ -13,12 +13,6 @@ case "$1" in
         run_vlc_cache_gen
         exit 0
         ;;
-
-    configure)
-        # Make sure that the plugins cache is generated if only vlc-nox is
-        # installed.
-        dpkg-trigger /usr/lib/vlc/plugins
-        ;;
 esac
 
 #DEBHELPER#
diff --git a/debian/vlc-nox.postrm b/debian/libvlc-bin.postrm
similarity index 100%
rename from debian/vlc-nox.postrm
rename to debian/libvlc-bin.postrm
diff --git a/debian/vlc-nox.triggers b/debian/libvlc-bin.triggers
similarity index 100%
rename from debian/vlc-nox.triggers
rename to debian/libvlc-bin.triggers
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index a988b16..a520ac5 100755
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -187,6 +187,5 @@ 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/lib/vlc/vlc-cache-gen
 usr/share/man
 EOF

-- 
VLC media player packaging