[SCM] qtwebchannel packaging branch, master, updated. 07d44e7a08ce48a3cade45480783adbb9e389eba

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 4c6feb8093d18724269bc24c7983a7847c85137f
Author: Sandro Knauß <sknauss at kde.org>
Date:   Thu Jul 28 11:10:36 2016 +0200

    Build documentation
---
 debian/control                  | 7 ++++---
 debian/qtwebchannel-doc.install | 2 +-
 debian/rules                    | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index f7883f2..7ab4f0d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,13 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Scarlett Clark <sgclark at kubuntu.org>
 Build-Depends: cmake,
                debhelper (>= 9),
+               libqt5sql5-sqlite,
                pkg-kde-tools,
                qtbase5-dev (>= 5.6.0+dfsg~),
                qtbase5-private-dev (>= 5.6.0+dfsg~),
                qtchooser,
-               qtdeclarative5-private-dev (>= 5.6.0~)
+               qtdeclarative5-private-dev (>= 5.6.0~),
+               qttools5-dev-tools
 Standards-Version: 3.9.8
 Homepage: http://doc.qt.io/qt-5/qtwebchannel-index.html
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/qt/qtwebchannel.git
@@ -17,8 +19,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwebchannel.git
 
 Package: qtwebchannel-doc
 Section: doc
-Architecture: any
-Multi-Arch: same
+Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends}
 Description: QtWebChannel Docuentation
diff --git a/debian/qtwebchannel-doc.install b/debian/qtwebchannel-doc.install
index 6257402..2713b07 100644
--- a/debian/qtwebchannel-doc.install
+++ b/debian/qtwebchannel-doc.install
@@ -1 +1 @@
-usr/share/qt5/doc/qtchannel.qch
+usr/share/qt5/doc/qtwebchannel.qch
diff --git a/debian/rules b/debian/rules
index 11c47c9..39c324d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@ export QT_SELECT := qt5
 override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=" src"
 
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
+
 override_dh_auto_install-arch:
 	dh_auto_install
 
@@ -25,5 +28,8 @@ override_dh_auto_install-arch:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_install:
 	dh_install --fail-missing

-- 
qtwebchannel packaging