[SCM] qtwayland packaging branch, experimental, updated. debian/5.6.1-2-12-gc475c24

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit a3a104f3bd7b514c1358748079e2a931bcec8a6f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jul 8 21:17:08 2016 +0300

    Build and install the Qt Wayland Compositor documentation.
---
 debian/changelog                   |  1 +
 debian/control                     | 27 +++++++++++++++++++++++++++
 debian/qtwayland5-doc-html.install |  1 +
 debian/qtwayland5-doc.install      |  1 +
 debian/rules                       |  8 +++++++-
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0dc102b..3992baa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtwayland-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Bump Qt build-dependencies to 5.7.0.
   * Bump libwayland-dev build-dependency to 1.6.0, following upstream.
+  * Build and install the Qt Wayland Compositor documentation.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Jun 2016 15:05:14 +0200
 
diff --git a/debian/control b/debian/control
index f951ace..cde6635 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,9 @@ Build-Depends: debhelper (>= 9),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.7.0+dfsg~),
                qtdeclarative5-private-dev (>= 5.7.0+dfsg~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.0+dfsg~),
+                     qtbase5-doc-html (>= 5.7.0+dfsg~),
+                     qttools5-dev-tools (>= 5.7.0~)
 Standards-Version: 3.9.8
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwayland.git
@@ -114,3 +117,27 @@ Description: QtWayland debugging symbols
  QtWayland is a Qt 5 module that wraps the functionality of Wayland.
  .
  This package contains the debugging symbols for QtWayland.
+
+Package: qtwayland5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 Wayland Compositor 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 Wayland Compositor
+ library.
+
+Package: qtwayland5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 Wayland Compositor HTML 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 HTML documentation for the Qt 5 Wayland Compositor
+ library.
diff --git a/debian/qtwayland5-doc-html.install b/debian/qtwayland5-doc-html.install
new file mode 100644
index 0000000..4b8762c
--- /dev/null
+++ b/debian/qtwayland5-doc-html.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtwaylandcompositor/
diff --git a/debian/qtwayland5-doc.install b/debian/qtwayland5-doc.install
new file mode 100644
index 0000000..15699f8
--- /dev/null
+++ b/debian/qtwayland5-doc.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtwaylandcompositor.qch
diff --git a/debian/rules b/debian/rules
index 48855c0..e9526c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,13 @@ export QT_SELECT := qt5
 override_dh_auto_configure:
 	qmake
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
+
+override_dh_auto_install-indep:
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
+override_dh_auto_install-arch:
 	dh_auto_install
 
 	# Remove libtool-like file

-- 
qtwayland packaging