[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-31-gf09aec6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit f09aec692a71121485fd9e7d288376a958dba6b1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 18 23:09:32 2015 -0300

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

diff --git a/debian/changelog b/debian/changelog
index 97581ab..6c86614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
     code. It is not really needed, but it's the best way to calm down Lintian
     and be sure nothing will break in the future.
   * Do not ship libQt5Bootstrap, it's only used internally (Closes: #778717).
+  * Do not ship docs' scripts empty directories.
 
   [ Dmitry Shachnev ]
   * Drop private marks from QCollator, QOpenGLWidget and QAccessible*
diff --git a/debian/rules b/debian/rules
index fa5fd03..d2914da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -281,6 +281,9 @@ endif
 
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
+	# Docs are shipping empty directories, most probably for scripts only present
+	# when building online-html.
+	find $(CURDIR)/debian/tmp/usr/share/qt5/doc/ -type d -empty -delete -print
 
 override_dh_install:
 	# Now flush all the .install-* files as .install files.

-- 
qtbase packaging