[SCM] qttools packaging branch, master, updated. debian/5.2.1-7-3-gd29af4b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 99ab6156244bab4b05bc29552c9e804ceaf7bc9b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 12 11:10:49 2014 +0400

    Build qtxmlpatterns5-doc package from this source.
    
    This should finally solve the dependency loop problem.
---
 debian/changelog                  |  2 ++
 debian/control                    | 16 +++++++++++++++-
 debian/qtxmlpatterns5-doc.install |  1 +
 debian/rules                      |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2add1d..77290e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qttools-opensource-src (5.2.1-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update debian/libqt5designer5.symbols from buildds’ logs.
+  * Build qtxmlpatterns5-doc package from this source.
+    This should finally solve the dependency loop problem.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 12 Feb 2014 10:51:16 +0400
 
diff --git a/debian/control b/debian/control
index 70c1002..f0cbd5b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-Depends: debhelper (>= 9),
                qtbase5-private-dev (>= 5.2.1+dfsg-1~),
                qtdeclarative5-private-dev (>= 5.2.1~),
                zlib1g-dev
-Build-Depends-Indep: qtbase5-doc-html, qtdeclarative5-doc-html
+Build-Depends-Indep: qtbase5-doc-html,
+                     qtdeclarative5-doc-html,
+                     qtxmlpatterns5-doc-html
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qttools.git
@@ -217,3 +219,15 @@ Description: Qt 5 tools HTML documentation
  .
  This package contains the HTML documentation for the Qt 5 tools
  libraries and binaries.
+
+Package: qtxmlpatterns5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 XML patterns documentation
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the documentation for the Qt 5 XML patterns
+ libraries.
diff --git a/debian/qtxmlpatterns5-doc.install b/debian/qtxmlpatterns5-doc.install
new file mode 100644
index 0000000..2dfef5a
--- /dev/null
+++ b/debian/qtxmlpatterns5-doc.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtxmlpatterns.qch
diff --git a/debian/rules b/debian/rules
index 96dff96..4f344ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 	set -ex; for subdir in qdoc qmake qtconcurrent qtcore qtdbus qtgui qtnetwork \
 	                       qtopengl qtprintsupport qtsql qttestlib qtwidgets qtxml \
-	                       qtqml qtquick qtquickdialogs; do \
+	                       qtqml qtquick qtquickdialogs qtxmlpatterns; do \
 		LD_LIBRARY_PATH=$(CURDIR)/lib $(CURDIR)/bin/qhelpgenerator \
 			/usr/share/qt5/doc/$$subdir/$$subdir.qhp -o \
 			$(CURDIR)/debian/tmp/usr/share/qt5/doc/$$subdir.qch; \

-- 
qttools packaging