[SCM] vlc/experimental: Fix warning from about non-empty directory

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 30a7dd22d95fdfbe14c749865d850c9fb73d9bf6
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Mar 23 17:17:31 2017 +0100

    Fix warning from about non-empty directory
    
    Closes: #854928

diff --git a/debian/libvlc-bin.lintian-overrides b/debian/libvlc-bin.lintian-overrides
new file mode 100644
index 0000000..7d05e12
--- /dev/null
+++ b/debian/libvlc-bin.lintian-overrides
@@ -0,0 +1,2 @@
+# Maintainer scripts create plugins.dat there.
+libvlc-bin binary: package-contains-empty-directory usr/lib/*/vlc/plugins/
diff --git a/debian/libvlc-bin.postrm.in b/debian/libvlc-bin.postrm.in
deleted file mode 100644
index 159ea07..0000000
--- a/debian/libvlc-bin.postrm.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-set -e
-
-#DEBHELPER#
-
-if [ -d /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins ] ; then
-  rm -f /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins/plugins.dat
-  rmdir -p --ignore-fail-on-non-empty /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins
-fi
diff --git a/debian/libvlc-bin.prerm.in b/debian/libvlc-bin.prerm.in
new file mode 100644
index 0000000..28ac6dc
--- /dev/null
+++ b/debian/libvlc-bin.prerm.in
@@ -0,0 +1,10 @@
+#! /bin/sh
+set -e
+
+#DEBHELPER#
+
+case "$1" in
+    remove)
+        rm -f /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins/plugins.dat
+        ;;
+esac
diff --git a/debian/rules b/debian/rules
index cce3343..ea8fd51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -399,6 +399,8 @@ ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	dh_install -pvlc-bin extras/analyser/_vlc usr/share/zsh/vendor-completions
 endif
 	$(if $(shell dpkg-vendor --is Ubuntu && echo true),dh_install -pvlc-bin debian/source_vlc.py usr/share/apport/package-hooks/)
+	# Create empty directory for plugins.dat
+	mkdir -p debian/libvlc-bin/usr/lib/${DEB_HOST_MULTIARCH}/vlc/plugins
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS $(pluginpackages:%=-Nvlc-plugin-%)
@@ -417,6 +419,6 @@ override_dh_installdeb:
 	sed 's/#DEB_HOST_MULTIARCH#/${DEB_HOST_MULTIARCH}/g' \
 		debian/libvlc-bin.postinst.in > debian/libvlc-bin.postinst
 	sed 's/#DEB_HOST_MULTIARCH#/${DEB_HOST_MULTIARCH}/g' \
-		debian/libvlc-bin.postrm.in > debian/libvlc-bin.postrm
+		debian/libvlc-bin.prerm.in > debian/libvlc-bin.prerm
 	echo 'interest-noawait /usr/lib/${DEB_HOST_MULTIARCH}/vlc/plugins' > debian/libvlc-bin.triggers
 	dh_installdeb

-- 
VLC media player packaging