[SCM] qtmultimedia packaging branch, kubuntu_unstable, updated. debian/5.5.0-3

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=1a5c424

The following commit has been merged in the kubuntu_unstable branch:
commit 1a5c4243131c4f6f20b6c78e3b34831919100d9b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Aug 24 23:23:39 2015 -0300

    Do not install empty directories.
---
 debian/changelog | 1 +
 debian/rules     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0cf8f4f..3b91eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtmultimedia-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Mark private symbols in symbols files. It should make handling the later
     much easier.
   * Update debian/copyright.
+  * Do not install empty directories.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 20:40:09 -0300
 
diff --git a/debian/rules b/debian/rules
index 849786d..931d843 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,9 @@ override_dh_auto_install-arch:
 	# Remove CMake files for plugins, we don't need them.
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt5Multimedia/*Plugin.cmake
 
+	# Remove empty directories.
+	find debian/tmp -type d -empty -delete
+
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 

-- 
qtmultimedia packaging