[SCM] qttools packaging branch, master, updated. debian/5.9.2-5-4-ge7c302d

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit e7c302de151f07f653fb9166216e990389fca351
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 16 19:12:12 2018 +0300

    Regenerate the internal assistant.qch during build.
    
    Closes: #885484.
---
 debian/changelog | 1 +
 debian/clean     | 1 +
 debian/rules     | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5ad8e7a..6de4401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qttools-opensource-src (5.9.2-6) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Update no_qwebview_archs: remove alpha, and add sparc64.
   * Bump copyright years for The Qt Company in debian/copyright.
+  * Regenerate the internal assistant.qch during build (closes: #885484).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Jan 2018 11:05:34 +0300
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..506234d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+doc/assistant.qch
diff --git a/debian/rules b/debian/rules
index fe5892f..941ae23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,10 @@ override_dh_auto_build-indep:
 	cd src/qdoc; qmake
 	cd src/assistant/help; qmake
 	dh_auto_build -- docs
+	# Rebuild the internal assistant.qch which is used as a resource
+	cd src/assistant/assistant/doc/internal; qmake
+	dh_auto_build -- -Csrc/assistant/assistant/doc/internal docs
+	mv doc/assistant.qch src/assistant/assistant/assistant.qch
 
 override_dh_auto_install-arch:
 	dh_auto_install

-- 
qttools packaging