From d087f8c1e6404352777acc69a40acf5c48e185cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Sat, 22 Jul 2023 11:45:12 -0300 Subject: [PATCH] Build and package documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original from https://salsa.debian.org/qt-kde-team/qt6/qt6-base/-/merge_requests/5 Thanks to Eren Eroğlu for the patches! --- debian/README.source | 13 +++ debian/changelog | 3 + debian/control | 36 ++++++++ debian/qt6-base-doc-dev.install | 12 +++ debian/qt6-base-doc-html.doc-base.qmake | 9 ++ .../qt6-base-doc-html.doc-base.qtconcurrent | 9 ++ debian/qt6-base-doc-html.doc-base.qtcore | 9 ++ debian/qt6-base-doc-html.doc-base.qtdbus | 9 ++ debian/qt6-base-doc-html.doc-base.qtgui | 9 ++ debian/qt6-base-doc-html.doc-base.qtnetwork | 9 ++ debian/qt6-base-doc-html.doc-base.qtopengl | 9 ++ .../qt6-base-doc-html.doc-base.qtprintsupport | 9 ++ debian/qt6-base-doc-html.doc-base.qtsql | 9 ++ debian/qt6-base-doc-html.doc-base.qttest | 9 ++ debian/qt6-base-doc-html.doc-base.qtwidgets | 9 ++ debian/qt6-base-doc-html.doc-base.qtxml | 9 ++ debian/qt6-base-doc-html.install | 82 +++++++++++++++++++ debian/qt6-base-doc-html.links | 1 + debian/qt6-base-doc.install | 12 +++ debian/rules | 8 +- 20 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 debian/README.source create mode 100644 debian/qt6-base-doc-dev.install create mode 100644 debian/qt6-base-doc-html.doc-base.qmake create mode 100644 debian/qt6-base-doc-html.doc-base.qtconcurrent create mode 100644 debian/qt6-base-doc-html.doc-base.qtcore create mode 100644 debian/qt6-base-doc-html.doc-base.qtdbus create mode 100644 debian/qt6-base-doc-html.doc-base.qtgui create mode 100644 debian/qt6-base-doc-html.doc-base.qtnetwork create mode 100644 debian/qt6-base-doc-html.doc-base.qtopengl create mode 100644 debian/qt6-base-doc-html.doc-base.qtprintsupport create mode 100644 debian/qt6-base-doc-html.doc-base.qtsql create mode 100644 debian/qt6-base-doc-html.doc-base.qttest create mode 100644 debian/qt6-base-doc-html.doc-base.qtwidgets create mode 100644 debian/qt6-base-doc-html.doc-base.qtxml create mode 100644 debian/qt6-base-doc-html.install create mode 100644 debian/qt6-base-doc-html.links create mode 100644 debian/qt6-base-doc.install diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..9e2d3e7 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,13 @@ +Bootstrapping the docs packages +------------------------------- + +In order to generate documentation for Qt, qdoc and +qtattributionsscanner is needed. Thus you need to do +the following steps if you want to rebuild the Qt stack: + +* Build only arch-dependent packages from these sources: + - qt6-base + - qt6-declarative + - qt6-tools +* Build the arch-independent packages (-doc and -doc-html) of the above sources. +* Build the rest of the Qt stack in the usual way. diff --git a/debian/changelog b/debian/changelog index ef62778..e1f8e9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qt6-base (6.4.2+dfsg-15) UNRELEASED; urgency=medium + [ Eren Eroğlu ] + * Add qt6-base-doc* packages. + -- Debian Qt/KDE Maintainers Sat, 22 Jul 2023 10:59:11 -0300 qt6-base (6.4.2+dfsg-14) unstable; urgency=medium diff --git a/debian/control b/debian/control index cdbf759..4299ac8 100644 --- a/debian/control +++ b/debian/control @@ -73,6 +73,8 @@ Build-Depends: cmake (>= 3.24~), qt6-base-dev:native , unixodbc-dev, zlib1g-dev, +Build-Depends-Indep: qt6-base-dev (>= 6.4~) , + qt6-documentation-tools (>= 6.4~) , Standards-Version: 4.6.2 Section: libs Homepage: https://www.qt.io/developers/ @@ -455,3 +457,37 @@ Description: Qt 6 qmake Makefile generator tool many default values used to generate appropriate Makefiles. . This package contains also these platform specifications. + +Package: qt6-base-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Multi-Arch: foreign +Description: Qt 6 base 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 6 base libraries. + +Package: qt6-base-doc-html +Architecture: all +Section: doc +Depends: ${misc:Depends} +Multi-Arch: foreign +Description: Qt 6 base 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 6 base + libraries. + +Package: qt6-base-doc-dev +Architecture: all +Section: libdevel +Depends: ${misc:Depends} +Multi-Arch: foreign +Description: Qt 6 base tags files + 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 doxygen tags files for the qtbase documentation. diff --git a/debian/qt6-base-doc-dev.install b/debian/qt6-base-doc-dev.install new file mode 100644 index 0000000..647bac4 --- /dev/null +++ b/debian/qt6-base-doc-dev.install @@ -0,0 +1,12 @@ +usr/share/qt6/doc/qmake/qmake.tags +usr/share/qt6/doc/qtconcurrent/qtconcurrent.tags +usr/share/qt6/doc/qtcore/qtcore.tags +usr/share/qt6/doc/qtdbus/qtdbus.tags +usr/share/qt6/doc/qtgui/qtgui.tags +usr/share/qt6/doc/qtnetwork/qtnetwork.tags +usr/share/qt6/doc/qtopengl/qtopengl.tags +usr/share/qt6/doc/qtprintsupport/qtprintsupport.tags +usr/share/qt6/doc/qtsql/qtsql.tags +usr/share/qt6/doc/qttestlib/qttestlib.tags +usr/share/qt6/doc/qtwidgets/qtwidgets.tags +usr/share/qt6/doc/qtxml/qtxml.tags diff --git a/debian/qt6-base-doc-html.doc-base.qmake b/debian/qt6-base-doc-html.doc-base.qmake new file mode 100644 index 0000000..0ee4a0d --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qmake @@ -0,0 +1,9 @@ +Document: qt6-qmake-manual +Title: Qt 6 qmake Tool +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 qmake +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qmake/qmake-manual.html +Files: /usr/share/doc/qt6-base-doc-html/html/qmake/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtconcurrent b/debian/qt6-base-doc-html.doc-base.qtconcurrent new file mode 100644 index 0000000..76a03db --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtconcurrent @@ -0,0 +1,9 @@ +Document: qt6-concurrent +Title: Qt 6 Concurrent module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Concurrent +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtconcurrent/qtconcurrent-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtconcurrent/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtcore b/debian/qt6-base-doc-html.doc-base.qtcore new file mode 100644 index 0000000..326f8f6 --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtcore @@ -0,0 +1,9 @@ +Document: qt6-core +Title: Qt 6 Core module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Core +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtcore/qtcore-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtcore/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtdbus b/debian/qt6-base-doc-html.doc-base.qtdbus new file mode 100644 index 0000000..c94f05f --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtdbus @@ -0,0 +1,9 @@ +Document: qt6-dbus +Title: Qt 6 D-Bus module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 D-Bus +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtdbus/qtdbus-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtdbus/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtgui b/debian/qt6-base-doc-html.doc-base.qtgui new file mode 100644 index 0000000..b8916f0 --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtgui @@ -0,0 +1,9 @@ +Document: qt6-gui +Title: Qt 6 Gui module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Gui +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtgui/qtgui-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtgui/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtnetwork b/debian/qt6-base-doc-html.doc-base.qtnetwork new file mode 100644 index 0000000..c3b58dd --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtnetwork @@ -0,0 +1,9 @@ +Document: qt6-network +Title: Qt 6 Network module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Network +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtnetwork/qtnetwork-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtnetwork/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtopengl b/debian/qt6-base-doc-html.doc-base.qtopengl new file mode 100644 index 0000000..504558a --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtopengl @@ -0,0 +1,9 @@ +Document: qt6-opengl +Title: Qt 6 OpenGL module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 OpenGL +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtopengl/qtopengl-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtopengl/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtprintsupport b/debian/qt6-base-doc-html.doc-base.qtprintsupport new file mode 100644 index 0000000..1664418 --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtprintsupport @@ -0,0 +1,9 @@ +Document: qt6-printsupport +Title: Qt 6 Print Support module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Print Support +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtprintsupport/qtprintsupport-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtprintsupport/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtsql b/debian/qt6-base-doc-html.doc-base.qtsql new file mode 100644 index 0000000..e6a45cd --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtsql @@ -0,0 +1,9 @@ +Document: qt6-sql +Title: Qt 6 SQL module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 SQL +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtsql/qtsql-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtsql/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qttest b/debian/qt6-base-doc-html.doc-base.qttest new file mode 100644 index 0000000..c662d24 --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qttest @@ -0,0 +1,9 @@ +Document: qt6-test +Title: Qt 6 Test module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Test +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qttestlib/qttest-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qttestlib/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtwidgets b/debian/qt6-base-doc-html.doc-base.qtwidgets new file mode 100644 index 0000000..f87063d --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtwidgets @@ -0,0 +1,9 @@ +Document: qt6-widgets +Title: Qt 6 Widgets module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 Widgets +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtwidgets/qtwidgets-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtwidgets/*.html diff --git a/debian/qt6-base-doc-html.doc-base.qtxml b/debian/qt6-base-doc-html.doc-base.qtxml new file mode 100644 index 0000000..0148358 --- /dev/null +++ b/debian/qt6-base-doc-html.doc-base.qtxml @@ -0,0 +1,9 @@ +Document: qt6-xml +Title: Qt 6 XML module +Author: The Qt Company Ltd +Abstract: This is the HTML documentation for Qt 6 XML +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/qt6-base-doc-html/html/qtxml/qtxml-index.html +Files: /usr/share/doc/qt6-base-doc-html/html/qtxml/*.html diff --git a/debian/qt6-base-doc-html.install b/debian/qt6-base-doc-html.install new file mode 100644 index 0000000..442f0e7 --- /dev/null +++ b/debian/qt6-base-doc-html.install @@ -0,0 +1,82 @@ +usr/share/qt6/doc/qmake/*.html +usr/share/qt6/doc/qmake/*.index +usr/share/qt6/doc/qmake/*.sha1 +usr/share/qt6/doc/qmake/images/ +usr/share/qt6/doc/qmake/qmake.qhp +usr/share/qt6/doc/qmake/style/ +usr/share/qt6/doc/qtconcurrent/*.html +usr/share/qt6/doc/qtconcurrent/*.index +usr/share/qt6/doc/qtconcurrent/*.qhp +usr/share/qt6/doc/qtconcurrent/*.sha1 +usr/share/qt6/doc/qtconcurrent/*.xml +usr/share/qt6/doc/qtconcurrent/images/ +usr/share/qt6/doc/qtconcurrent/style/ +usr/share/qt6/doc/qtcore/*.html +usr/share/qt6/doc/qtcore/*.index +usr/share/qt6/doc/qtcore/*.qhp +usr/share/qt6/doc/qtcore/*.sha1 +usr/share/qt6/doc/qtcore/*.xml +usr/share/qt6/doc/qtcore/images/ +usr/share/qt6/doc/qtcore/style/ +usr/share/qt6/doc/qtdbus/*.html +usr/share/qt6/doc/qtdbus/*.index +usr/share/qt6/doc/qtdbus/*.qhp +usr/share/qt6/doc/qtdbus/*.sha1 +usr/share/qt6/doc/qtdbus/*.xml +usr/share/qt6/doc/qtdbus/images/ +usr/share/qt6/doc/qtdbus/style/ +usr/share/qt6/doc/qtgui/*.html +usr/share/qt6/doc/qtgui/*.index +usr/share/qt6/doc/qtgui/*.qhp +usr/share/qt6/doc/qtgui/*.sha1 +usr/share/qt6/doc/qtgui/*.xml +usr/share/qt6/doc/qtgui/images/ +usr/share/qt6/doc/qtgui/style/ +usr/share/qt6/doc/qtnetwork/*.html +usr/share/qt6/doc/qtnetwork/*.index +usr/share/qt6/doc/qtnetwork/*.qhp +usr/share/qt6/doc/qtnetwork/*.sha1 +usr/share/qt6/doc/qtnetwork/*.xml +usr/share/qt6/doc/qtnetwork/images/ +usr/share/qt6/doc/qtnetwork/style/ +usr/share/qt6/doc/qtopengl/*.html +usr/share/qt6/doc/qtopengl/*.index +usr/share/qt6/doc/qtopengl/*.qhp +usr/share/qt6/doc/qtopengl/*.xml +usr/share/qt6/doc/qtopengl/images/ +usr/share/qt6/doc/qtopengl/qtopengl.qhp.sha1 +usr/share/qt6/doc/qtopengl/style/ +usr/share/qt6/doc/qtprintsupport/*.html +usr/share/qt6/doc/qtprintsupport/*.index +usr/share/qt6/doc/qtprintsupport/*.qhp +usr/share/qt6/doc/qtprintsupport/*.sha1 +usr/share/qt6/doc/qtprintsupport/images/ +usr/share/qt6/doc/qtprintsupport/style/ +usr/share/qt6/doc/qtsql/*.html +usr/share/qt6/doc/qtsql/*.index +usr/share/qt6/doc/qtsql/*.qhp +usr/share/qt6/doc/qtsql/*.sha1 +usr/share/qt6/doc/qtsql/*.xml +usr/share/qt6/doc/qtsql/images/ +usr/share/qt6/doc/qtsql/style/ +usr/share/qt6/doc/qttestlib/*.html +usr/share/qt6/doc/qttestlib/*.index +usr/share/qt6/doc/qttestlib/*.qhp +usr/share/qt6/doc/qttestlib/*.sha1 +usr/share/qt6/doc/qttestlib/*.xml +usr/share/qt6/doc/qttestlib/images/ +usr/share/qt6/doc/qttestlib/style/ +usr/share/qt6/doc/qtwidgets/*.html +usr/share/qt6/doc/qtwidgets/*.index +usr/share/qt6/doc/qtwidgets/*.qhp +usr/share/qt6/doc/qtwidgets/*.sha1 +usr/share/qt6/doc/qtwidgets/*.xml +usr/share/qt6/doc/qtwidgets/images/ +usr/share/qt6/doc/qtwidgets/style/ +usr/share/qt6/doc/qtxml/*.html +usr/share/qt6/doc/qtxml/*.index +usr/share/qt6/doc/qtxml/*.qhp +usr/share/qt6/doc/qtxml/*.sha1 +usr/share/qt6/doc/qtxml/*.xml +usr/share/qt6/doc/qtxml/images/ +usr/share/qt6/doc/qtxml/style/ diff --git a/debian/qt6-base-doc-html.links b/debian/qt6-base-doc-html.links new file mode 100644 index 0000000..efaba0b --- /dev/null +++ b/debian/qt6-base-doc-html.links @@ -0,0 +1 @@ +usr/share/qt6/doc usr/share/doc/qt6-base-doc-html/html diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install new file mode 100644 index 0000000..77b0fdb --- /dev/null +++ b/debian/qt6-base-doc.install @@ -0,0 +1,12 @@ +usr/share/qt6/doc/qmake.qch +usr/share/qt6/doc/qtconcurrent.qch +usr/share/qt6/doc/qtcore.qch +usr/share/qt6/doc/qtdbus.qch +usr/share/qt6/doc/qtgui.qch +usr/share/qt6/doc/qtnetwork.qch +usr/share/qt6/doc/qtopengl.qch +usr/share/qt6/doc/qtprintsupport.qch +usr/share/qt6/doc/qtsql.qch +usr/share/qt6/doc/qttestlib.qch +usr/share/qt6/doc/qtwidgets.qch +usr/share/qt6/doc/qtxml.qch diff --git a/debian/rules b/debian/rules index eca3d0a..ba8738e 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,7 @@ override_dh_auto_configure: $(extra_cmake_args) -execute_after_dh_auto_install: +execute_after_dh_auto_install-arch: # Policy § 10.4. Remove this if https://bugs.debian.org/904409 gets fixed. sed -i 's,bin/env perl,bin/perl,' debian/tmp/usr/lib/qt6/libexec/*.pl \ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs/features/data/unix/findclasslist.pl @@ -108,6 +108,12 @@ execute_after_dh_auto_install: sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake +override_dh_auto_build-indep: + dh_auto_build -- docs + +override_dh_auto_install-indep: + DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs + override_dh_makeshlibs: dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa