[SCM] qttools packaging branch, master, updated. debian/5.9.2-5-8-gfc7e84d

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Jan 19 12:48:09 UTC 2018


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

The following commit has been merged in the master branch:
commit fc7e84db723520c949a3c23ef0f40e6e1649b1c4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 15:47:13 2018 +0300

    Move code to build the documentation tools into a common block.
---
 debian/rules | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0fb4736..8f2d4ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,16 +21,19 @@ override_dh_auto_clean:
 	rm -fv .qmake.cache
 	rm -fv debian/qttools5-dev-tools.install
 
-override_dh_auto_build-indep:
+build-doc-tools:
+	# Build qdoc, qhelpgenerator and qtattributionsscanner tools
 	cd src; qmake
 	dh_auto_build -- -Csrc sub-qdoc sub-qtattributionsscanner
 	cd src/assistant; qmake
 	dh_auto_build -- -Csrc/assistant sub-qhelpgenerator
+
+override_dh_auto_build-indep: build-doc-tools
 	cd src/qdoc; qmake
 	cd src/assistant/help; qmake
 	dh_auto_build -- docs
 
-override_dh_auto_build-arch:
+override_dh_auto_build-arch: build-doc-tools
 	# 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

-- 
qttools packaging



More information about the pkg-kde-commits mailing list