[neon/qt6/qt6-sensors/Neon/release] debian: Align to debian.

Scarlett Moore null at kde.org
Wed Oct 25 13:02:14 BST 2023 

Git commit 4b2aa9f5773f5de722d55ea9d90602202fa47f2a by Scarlett Moore.
Committed on 25/10/2023 at 14:01.
Pushed by scarlettmoore into branch 'Neon/release'.

Align to debian.

M  +59   -5    debian/changelog
M  +31   -8    debian/control
M  +2    -1    debian/qt6-sensors-dev.install
A  +9    -0    debian/qt6-sensors.doc-base.qtsensors
M  +8    -0    debian/qt6-sensors.install
A  +1    -0    debian/qt6-sensors.links
A  +3    -0    debian/qt6-sensors.lintian-overrides
M  +17   -3    debian/rules

https://invent.kde.org/neon/qt6/qt6-sensors/-/commit/4b2aa9f5773f5de722d55ea9d90602202fa47f2a

diff --git a/debian/changelog b/debian/changelog
index 07d6403..2848cd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,18 +4,72 @@ qt6-sensors (6.6.0-0neon) UNRELEASED; urgency=medium
 
  -- Patrick Franz <deltaone at debian.org>  Mon, 03 Apr 2023 16:58:31 +0100
 
-qt6-sensors (6.4.2-2) experimental; urgency=medium
+qt6-sensors (6.4.2-4) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 01 Aug 2023 18:21:30 +0200
+
+qt6-sensors (6.4.2-3) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Remove build-dependency on libqt6opengl6-dev as it has been merged
+    into qt6-base-dev.
+  * Add binary package for examples (Closes: #1042321).
+  * Add binary packages for documentation.
+
+ -- Patrick Franz <deltaone at debian.org>  Sat, 29 Jul 2023 01:35:56 +0200
+
+qt6-sensors (6.4.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 21 Jun 2023 00:50:57 +0200
+
+qt6-sensors (6.4.2-1) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Switch to the official 6.4.2 tarball, the tarball is the same.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 24 Jan 2023 12:41:41 +0100
+
+qt6-sensors (6.4.2~rc1-3) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Add a Provides for libqt6sensors6-dev.
+
+ -- Patrick Franz <deltaone at debian.org>  Sat, 31 Dec 2022 14:56:58 +0100
+
+qt6-sensors (6.4.2~rc1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 30 Dec 2022 16:58:54 +0100
+
+qt6-sensors (6.4.2~rc1-1) experimental; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * New upstream release.
+    - Bump Qt build dependencies.
+  * Bump standards version to 4.6.2, no changes required.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 27 Dec 2022 22:27:28 +0100
+
+qt6-sensors (6.4.1-2) experimental; urgency=medium
 
   [ Patrick Franz ]
   * Rename libqt6sensors6-dev to qt6-sensors-dev.
 
  -- Patrick Franz <deltaone at debian.org>  Wed, 30 Nov 2022 22:48:21 +0100
 
-qt6-sensors (6.4.2-1) experimental; urgency=medium
+qt6-sensors (6.4.1-1) experimental; urgency=medium
 
   [ Patrick Franz ]
-  * New upstream release (6.4.2).
-  * Bump Qt B-Ds to 6.4.2.
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
   * Enable link time optimization.
 
  -- Patrick Franz <deltaone at debian.org>  Sat, 19 Nov 2022 01:04:47 +0100
@@ -106,4 +160,4 @@ qt6-sensors (6.2.1-1) experimental; urgency=medium
 
   * Initial release (Closes: #999894)
 
- -- Patrick Franz <deltaone at debian.org>  Thu, 18 Nov 2021 08:38:54 +0100
\ No newline at end of file
+ -- Patrick Franz <deltaone at debian.org>  Thu, 18 Nov 2021 08:38:54 +0100
diff --git a/debian/control b/debian/control
index 1fe6957..ef8fb33 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,27 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake,
+Build-Depends: cmake (>= 3.24~),
                debhelper-compat (= 13),
                dh-exec,
                libgl-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
-               libxkbcommon-dev,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
+               qml6-module-qtquick (>= 6.4.2+dfsg~),
+               qml6-module-qttest (>= 6.4.2+dfsg~),
                qt6-base-dev (>= 6.4.2+dfsg~),
+               qt6-base-private-dev (>= 6.4.2+dfsg~),
                qt6-declarative-dev (>= 6.4.2+dfsg~),
+               qt6-declarative-private-dev (>= 6.4.2+dfsg~),
                qt6-svg-dev (>= 6.4.2~),
                xauth <!nocheck>,
-               xvfb <!nocheck>
-Standards-Version: 4.6.1
+               xvfb <!nocheck>,
+Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
+Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-sensors
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-sensors.git
@@ -56,19 +61,37 @@ Depends: qt6-sensors
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6sensors6-dev
+Package: libqt6sensorsquick6
 Architecture: all
-Depends: qt6-sensors-dev
+Depends: qt6-sensors
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6sensorsquick6
+Package: qml6-module-qtsensors
 Architecture: all
 Depends: qt6-sensors
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qtsensors
+Package: qt6-sensors-doc
+Architecture: all
+Depends: qt6-sensors-dev
+Description: Dummy transitional
+ Transitional dummy package
+
+Package: qt6-sensors-doc-html
+Architecture: all
+Depends: qt6-sensors-dev
+Description: Dummy transitional
+ Transitional dummy package
+
+Package: qt6-sensors-doc-dev
+Architecture: all
+Depends: qt6-sensors-dev
+Description: Dummy transitional
+ Transitional dummy package
+
+Package: qt6-sensors-examples
 Architecture: all
 Depends: qt6-sensors
 Description: Dummy transitional
diff --git a/debian/qt6-sensors-dev.install b/debian/qt6-sensors-dev.install
index 206fd38..8955205 100755
--- a/debian/qt6-sensors-dev.install
+++ b/debian/qt6-sensors-dev.install
@@ -13,4 +13,5 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6SensorsQuick.so
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
\ No newline at end of file
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
+usr/share/qt6/doc/qtsensors/qtsensors.tags
diff --git a/debian/qt6-sensors.doc-base.qtsensors b/debian/qt6-sensors.doc-base.qtsensors
new file mode 100644
index 0000000..3f75e65
--- /dev/null
+++ b/debian/qt6-sensors.doc-base.qtsensors
@@ -0,0 +1,9 @@
+Document: qt6-sensors-manual
+Title: Qt 6 Sensors
+Author: The Qt Company Ltd
+Abstract: This is the HTML documentation for Qt 6 Sensors
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/qt6-sensors-doc-html/html/qtsensors/qtsensors-index.html
+Files: /usr/share/doc/qt6-sensors-doc-html/html/qtsensors/*.html
diff --git a/debian/qt6-sensors.install b/debian/qt6-sensors.install
index 2e13b39..4447d07 100644
--- a/debian/qt6-sensors.install
+++ b/debian/qt6-sensors.install
@@ -4,3 +4,11 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6Sensors.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6SensorsQuick.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sensors/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtSensors/
+usr/share/qt6/doc/qtsensors/examples-manifest.xml
+usr/share/qt6/doc/qtsensors/images/*
+usr/share/qt6/doc/qtsensors/*.html
+usr/share/qt6/doc/qtsensors/qtsensors.index
+usr/share/qt6/doc/qtsensors/qtsensors.qhp
+usr/share/qt6/doc/qtsensors/qtsensors.qhp.sha1
+usr/share/qt6/doc/qtsensors/style/*
+usr/share/qt6/doc/qtsensors.qch
diff --git a/debian/qt6-sensors.links b/debian/qt6-sensors.links
new file mode 100644
index 0000000..35fddb8
--- /dev/null
+++ b/debian/qt6-sensors.links
@@ -0,0 +1 @@
+usr/share/qt6/doc usr/share/doc/qt6-sensors-doc-html/html
diff --git a/debian/qt6-sensors.lintian-overrides b/debian/qt6-sensors.lintian-overrides
new file mode 100644
index 0000000..e7652fc
--- /dev/null
+++ b/debian/qt6-sensors.lintian-overrides
@@ -0,0 +1,3 @@
+# Documentation in Qt 6 is installed in usr/share/qt6, we create symlinks from
+# doc in order to solve this.
+qt6-sensors-doc-html: package-contains-documentation-outside-usr-share-doc *
diff --git a/debian/rules b/debian/rules
index 0d56bff..dba1943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,31 @@
 #!/usr/bin/make -f
-
 include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		$(extra_cmake_args)
+
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
+
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+	# Remove build path from index files.
+	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+               sed -i 's@$(CURDIR)/@@g' {} \;
 
-execute_after_dh_auto_install:
+execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files
 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl

More information about the Neon-commits mailing list