[SCM] qttools packaging branch, experimental, updated. debian/5.5.1-3-9-g0e0988b

Dmitry Shachnev mitya57 at moszumanska.debian.org
Wed Jan 6 18:29:16 UTC 2016


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

The following commit has been merged in the experimental branch:
commit ea86e65d91053e0544cf139bd59275fcb01fb7cb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 6 21:27:49 2016 +0300

    Build qdoc before building docs.
---
 debian/changelog | 1 +
 debian/rules     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6c6f17d..14524e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qttools-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
   * Bump other Qt build-dependencies to 5.6.0~beta.
   * Disable building qch documentation for base Qt modules in this source, as
     those modules can no longer provide the HTML documentation on their own.
+  * Build qdoc before building docs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Nov 2015 21:02:38 +0300
 
diff --git a/debian/rules b/debian/rules
index 4790af0..5ffc661 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_clean:
 	rm -fv .qmake.cache
 
 override_dh_auto_build-indep:
+	cd src; qmake; $(MAKE) sub-qdoc
 	cd src/assistant; qmake; $(MAKE) sub-qhelpgenerator
 	cd src/assistant/help; qmake
 	dh_auto_build -Smakefile -- docs

-- 
qttools packaging



More information about the pkg-kde-commits mailing list