[SCM] qt3d packaging branch, master, updated. 335cf287d1d686bdab4897e611eef8d2a337916f

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Sep 3 15:25:09 UTC 2015


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

The following commit has been merged in the master branch:
commit 335cf287d1d686bdab4897e611eef8d2a337916f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Sep 3 18:25:04 2015 +0300

    Build documentation packages.
---
 debian/control               | 24 ++++++++++++++++++++++++
 debian/qt3d-doc-html.install |  2 ++
 debian/qt3d-doc.install      |  2 ++
 debian/rules                 |  6 ++++++
 4 files changed, 34 insertions(+)

diff --git a/debian/control b/debian/control
index 0f9e83a..a231bb0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,10 @@ Build-Depends: debhelper (>= 9),
                xauth,
                xvfb,
                zlib1g-dev,
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.5.0+dfsg~),
+                     qtbase5-doc-html (>= 5.5.0+dfsg~),
+                     qtdeclarative5-doc-html (>= 5.5.0~),
+                     qttools5-dev-tools (>= 5.5.0~)
 Standards-Version: 3.9.6
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qt3d.git
@@ -150,3 +154,23 @@ Description: Qt 3D library debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 3D
  libraries.
+
+Package: qt3d5-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 3D 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 3D libraries.
+
+Package: qt3d5-doc-html
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 3D 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 3D libraries.
diff --git a/debian/qt3d-doc-html.install b/debian/qt3d-doc-html.install
new file mode 100644
index 0000000..62905bc
--- /dev/null
+++ b/debian/qt3d-doc-html.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/qt3dcore/
+usr/share/qt5/doc/qt3drenderer/
diff --git a/debian/qt3d-doc.install b/debian/qt3d-doc.install
new file mode 100644
index 0000000..99d7a1b
--- /dev/null
+++ b/debian/qt3d-doc.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/qt3dcore.qch
+usr/share/qt5/doc/qt3drenderer.qch
diff --git a/debian/rules b/debian/rules
index b7c586e..6c77da4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ testrun_architectures := amd64 arm64 armhf i386 ppc64el
 override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=tests
 
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
+
 override_dh_auto_install-arch:
 	dh_auto_install
 	
@@ -38,6 +41,9 @@ override_dh_auto_install-arch:
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 
+override_dh_auto_install-indep:
+	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_auto_test-arch:
 ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(testrun_architectures)))
 	xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml

-- 
qt3d packaging



More information about the pkg-kde-commits mailing list