[neon/qt6/qt6-mqtt/Neon/unstable] debian: port to qt6-qtmqtt
Carlos De Maine
null at kde.org
Thu Jul 27 06:01:03 BST 2023
Git commit 6ee02c86777878a8f1a5c90ed7fb42a11ee499c4 by Carlos De Maine.
Committed on 27/07/2023 at 07:00.
Pushed by carlosdem into branch 'Neon/unstable'.
port to qt6-qtmqtt
M +2 -2 debian/changelog
M +57 -25 debian/control
D +0 -7 debian/libqt5mqtt-dev.install
D +0 -1 debian/libqt5mqtt5-examples.install
D +0 -1 debian/libqt5mqtt5.install
A +8 -0 debian/qt6-mqtt-dev.install
A +1 -0 debian/qt6-mqtt.install
M +11 -9 debian/rules
M +2 -2 debian/watch
https://invent.kde.org/neon/qt6/qt6-mqtt/-/commit/6ee02c86777878a8f1a5c90ed7fb42a11ee499c4
diff --git a/debian/changelog b/debian/changelog
index 78eb58e..a8db6eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-qtmqtt-opensource-src (5.15.2-0neon) UNRELEASED; urgency=medium
+qt6-mqtt (6.6.0~beta2-0neon) UNRELEASED; urgency=medium
- * Initial release
+ * Initial qt6 release
-- Carlos De Maine <carlosdemaine at gmail.com> Wed, 3 Mar 2023 10:55:21 +1000
diff --git a/debian/control b/debian/control
index fe7e969..35c4050 100644
--- a/debian/control
+++ b/debian/control
@@ -1,38 +1,70 @@
-Source: qtmqtt-opensource-src
+Source: qt6-mqtt
Section: libs
Priority: optional
Maintainer: KDE neon <neon at kde.org>
-Build-Depends: debhelper,
+Build-Depends: cmake,
+ debhelper,
debhelper-compat (= 13),
- qtbase5-dev,
- qtbase5-private-dev
-Standards-Version: 4.5.1.0
+ ninja-build,
+ pkg-config,
+ pkg-kde-tools,
+ qt6-base-dev,
+ qt6-base-dev-tools,
+Standards-Version: 4.6.2
Homepage: https://www.qt.io/developers/
+Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-datavis3d
+Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-datavis3d.git
+Rules-Requires-Root: no
-Package: libqt5mqtt5
+Package: qt6-mqtt
Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Section: kde
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Description: qtmqtt for Qt
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt MQTT Library
+ MQTT is a machine-to-machine (M2M) protocol utilizing the publish-and-subscribe
+ paradigm. Its purpose is to provide a channel with minimal communication overhead.
.
- This package contains the libraries.
-
-Package: libqt5mqtt-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: libqt5mqtt5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
-Description: qtmqtt for Qt - development files
+ Generally, MQTT is used on top of a TCP connection. However, the base requirement
+ is defined as an ordered, lossless, bidirectional connection.
.
- This package contains the development files needed to build Qt 5 applications
- using the library.
+ The Qt MQTT module provides a standard compliant implementation of the MQTT protocol
+ specification. It enables applications to act as telemetry displays and devices to
+ publish telemetry data. The supported versions are MQTT 3.1, MQTT 3.1.1, and MQTT 5.0.
-Package: libqt5mqtt5-examples
+Package: qt6-mqtt-dev
Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: qtmqtt for Qt - examples
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base (= ${binary:Version}),
+ qt6-base-dev-tools (= ${binary:Version}),
+ ${misc:Depends}
+Recommends: libqt6opengl6-dev (= ${binary:Version})
+Breaks: libqt6opengl6-dev (<< 6.3.1+dfsg-10~), qt6-base (<< 6.5.0)
+Suggests: cmake
+Replaces: qt6-base (<< 6.5.0)
+Description: Qt 6 MQTT development 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 examples for qtmqtt.
+ This package contains the header development files used for building
+ Qt 6 MQTT applications.
+
+Package: libqt6mqtt6
+Architecture: all
+Depends: qt6-mqtt
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6mqtt-dev
+Architecture: all
+Depends: qt6-mqtt-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6mqtt6-examples
+Architecture: all
+Depends: qt6-mqtt
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libqt5mqtt-dev.install b/debian/libqt5mqtt-dev.install
deleted file mode 100644
index 18c7691..0000000
--- a/debian/libqt5mqtt-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/include/*/qt5/QtMqtt/QMqtt*
-usr/include/*/qt5/QtMqtt/qmqtt*.h
-usr/include/*/qt5/QtMqtt/qtmqttversion.h
-usr/include/*/qt5/QtMqtt/QtMqtt*
-usr/lib/*/cmake/Qt5Mqtt/*
-usr/lib/*/libQt5Mqtt.so
-usr/lib/*/pkgconfig/Qt5Mqtt.pc
diff --git a/debian/libqt5mqtt5-examples.install b/debian/libqt5mqtt5-examples.install
deleted file mode 100644
index b48c251..0000000
--- a/debian/libqt5mqtt5-examples.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/examples/mqtt/
diff --git a/debian/libqt5mqtt5.install b/debian/libqt5mqtt5.install
deleted file mode 100644
index 1f32b71..0000000
--- a/debian/libqt5mqtt5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQt5Mqtt.so.5*
diff --git a/debian/qt6-mqtt-dev.install b/debian/qt6-mqtt-dev.install
new file mode 100644
index 0000000..6f91f71
--- /dev/null
+++ b/debian/qt6-mqtt-dev.install
@@ -0,0 +1,8 @@
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMqtt/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6Mqtt.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6Mqtt.prl
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Mqtt.pc
diff --git a/debian/qt6-mqtt.install b/debian/qt6-mqtt.install
new file mode 100644
index 0000000..0da413e
--- /dev/null
+++ b/debian/qt6-mqtt.install
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6Mqtt.so.6*
diff --git a/debian/rules b/debian/rules
index 43ec840..62ab791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,17 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpkg/architecture.mk
-export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) $(shell getconf LFS_CFLAGS)
-export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) $(shell getconf LFS_CFLAGS)
-export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-export QT_SELECT := qt5
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --with pkgkde_symbolshelper
+ dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
-override_dh_missing:
- dh_missing --fail-missing
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+execute_after_dh_auto_install:
+ # 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
diff --git a/debian/watch b/debian/watch
index ec9170e..ca288c4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
opts=uversionmangle=s/-/~/ \
-https://download.qt.io/archive/qt/([\d\.]*)/([\d\.]*)/submodules/qtmqtt-everywhere-src-(.*)\.tar\.xz
+https://qt-mirror.dannhauer.de/development_releases/qt/([\d\.]+)/([\d\.]+)-beta(\d)/submodules/qtmqtt-everywhere-src-([\d\.]+-beta\d).tar.xz
More information about the Neon-commits
mailing list