[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.6.0-beta-1-2-g0c5f009

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 0c5f009fb3ec914036cdf2175396cee8160dae9b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jan 7 23:07:33 2016 +0300

    Re-enable building the documentation.
---
 debian/changelog                       |  2 ++
 debian/control                         | 36 +++++++++++++++++++++++-----------
 debian/qtdeclarative5-doc-html.install |  3 ++-
 debian/qtdeclarative5-doc.install      |  2 ++
 debian/rules                           |  4 ++--
 5 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ca4893..f5f711c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtdeclarative-opensource-src (5.6.0~beta-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Re-enable building the documentation.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Jan 2016 23:04:35 +0300
 
diff --git a/debian/control b/debian/control
index 936a8a2..00cd072 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,9 @@ Build-Depends: debhelper (>= 9),
                pkg-kde-tools (>= 0.15.17~),
                python,
                qtbase5-private-dev (>= 5.6.0~beta+dfsg~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~beta+dfsg~),
+                     qtbase5-doc-html (>= 5.6.0~beta+dfsg~),
+                     qttools5-dev-tools (>= 5.6.0~)
 Standards-Version: 3.9.6
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
@@ -347,14 +350,25 @@ Description: Qt 5 declarative libraries debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 declarative libraries.
 
-#Package: qtdeclarative5-doc-html
-#Priority: extra
-#Architecture: all
-#Section: doc
-#Depends: ${misc:Depends}
-#Description: Qt 5 declarative 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 declarative
-# libraries.
+Package: qtdeclarative5-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 declarative 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 declarative libraries.
+
+Package: qtdeclarative5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 declarative 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 declarative
+ libraries.
diff --git a/debian/qtdeclarative5-doc-html.install b/debian/qtdeclarative5-doc-html.install
index f97e055..d4be997 100644
--- a/debian/qtdeclarative5-doc-html.install
+++ b/debian/qtdeclarative5-doc-html.install
@@ -1 +1,2 @@
-usr/share/qt5/doc/
+usr/share/qt5/doc/qtqml/
+usr/share/qt5/doc/qtquick/
diff --git a/debian/qtdeclarative5-doc.install b/debian/qtdeclarative5-doc.install
new file mode 100644
index 0000000..a97cbad
--- /dev/null
+++ b/debian/qtdeclarative5-doc.install
@@ -0,0 +1,2 @@
+/usr/share/qt5/doc/qtqml.qch
+/usr/share/qt5/doc/qtquick.qch
diff --git a/debian/rules b/debian/rules
index 6aab719..7ad5da1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_auto_configure:
 	qmake
 
 override_dh_auto_build-indep:
-	#dh_auto_build -Smakefile -- html_docs
+	dh_auto_build -- docs
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -45,7 +45,7 @@ override_dh_auto_install-arch:
 	\) -print0 | xargs -0 chmod a-x
 
 override_dh_auto_install-indep:
-	#make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
 	# Remove empty directories.

-- 
qtdeclarative packaging