[SCM] qbs packaging branch, master, updated. debian/1.5.0+dfsg-3-3-gf90f340

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit f90f340b74f5c6b9a14b306730f1583d5bbbbd9d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 18 17:31:10 2016 +0300

    Drop the rules to remove empty directories in documentation.
    
    qdoc no longer creates them (since Qt 5.6.1).
---
 debian/changelog | 2 ++
 debian/rules     | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9acb04b..ac35ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qbs (1.5.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refresh skip_test_concurrent.diff.
+  * Drop the rules to remove empty directories in documentation, qdoc no
+    longer creates them (since Qt 5.6.1).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 18 Jun 2016 12:11:44 +0300
 
diff --git a/debian/rules b/debian/rules
index 7cf3849..9857f62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,10 +39,6 @@ override_dh_auto_install-indep:
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
 
-	# Remove empty directories
-	rmdir $(CURDIR)/debian/tmp/usr/share/doc/qbs/html/images/used-in-examples/
-	rmdir $(CURDIR)/debian/tmp/usr/share/doc/qbs/html/scripts/
-
 override_dh_auto_test-arch:
 	mkdir -p $(CONFIG_DIR)/QtProject
 	set -ex; \

-- 
qbs packaging