From 13c6e8a7e228034ff2240f20dd8a397a1265014a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 5 Aug 2025 10:55:22 +0200 Subject: [PATCH] Add Qt6 debian packaging --- debian | 1 + {debian => debian-qt5}/changelog | 0 {debian => debian-qt5}/compat | 0 {debian => debian-qt5}/control | 25 +++++------ {debian => debian-qt5}/copyright | 6 +-- .../libnymea-gpio-dev.install.in | 0 .../libnymea-gpio.install.in | 0 debian-qt5/nymea-gpio-tool.install.in | 1 + {debian => debian-qt5}/rules | 0 {debian => debian-qt5}/source/format | 0 debian-qt6/changelog | 1 + debian-qt6/compat | 1 + debian-qt6/control | 42 +++++++++++++++++++ debian-qt6/copyright | 1 + debian-qt6/libnymea-gpio-dev.install.in | 1 + debian-qt6/libnymea-gpio.install.in | 1 + debian-qt6/nymea-gpio-tool.install.in | 1 + debian-qt6/rules | 24 +++++++++++ debian-qt6/source | 1 + debian/nymea-gpio-tool.install.in | 1 - 20 files changed, 91 insertions(+), 16 deletions(-) create mode 120000 debian rename {debian => debian-qt5}/changelog (100%) rename {debian => debian-qt5}/compat (100%) rename {debian => debian-qt5}/control (51%) rename {debian => debian-qt5}/copyright (75%) rename {debian => debian-qt5}/libnymea-gpio-dev.install.in (100%) rename {debian => debian-qt5}/libnymea-gpio.install.in (100%) create mode 100644 debian-qt5/nymea-gpio-tool.install.in rename {debian => debian-qt5}/rules (100%) rename {debian => debian-qt5}/source/format (100%) create mode 120000 debian-qt6/changelog create mode 100644 debian-qt6/compat create mode 100644 debian-qt6/control create mode 120000 debian-qt6/copyright create mode 120000 debian-qt6/libnymea-gpio-dev.install.in create mode 120000 debian-qt6/libnymea-gpio.install.in create mode 120000 debian-qt6/nymea-gpio-tool.install.in create mode 100755 debian-qt6/rules create mode 120000 debian-qt6/source delete mode 100644 debian/nymea-gpio-tool.install.in diff --git a/debian b/debian new file mode 120000 index 0000000..cd83f55 --- /dev/null +++ b/debian @@ -0,0 +1 @@ +debian-qt5 \ No newline at end of file diff --git a/debian/changelog b/debian-qt5/changelog similarity index 100% rename from debian/changelog rename to debian-qt5/changelog diff --git a/debian/compat b/debian-qt5/compat similarity index 100% rename from debian/compat rename to debian-qt5/compat diff --git a/debian/control b/debian-qt5/control similarity index 51% rename from debian/control rename to debian-qt5/control index e3bd4cb..c335135 100644 --- a/debian/control +++ b/debian-qt5/control @@ -1,13 +1,14 @@ Source: nymea-gpio Section: utils Priority: optional -Maintainer: Simon Stürz +Maintainer: nymea GmbH Standards-Version: 4.6.0 -Build-Depends: debhelper (>= 9.0.0), - dpkg-dev (>= 1.16.1~), - qt5-qmake, - qtbase5-dev, - qtbase5-dev-tools +Vcs-Git: https://github.com/nymea/nymea-gpio.git +Build-Depends: debhelper, + dpkg-dev, + qt5-qmake, + qtbase5-dev, + qtbase5-dev-tools Package: libnymea-gpio @@ -16,8 +17,8 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Qt 5 based library for GPIO interaction. - Qt 5 based library for GPIO interaction. +Description: Qt based library for GPIO interaction. + Qt based library for GPIO interaction. Package: nymea-gpio-tool @@ -26,8 +27,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libnymea-gpio (= ${binary:Version}) -Description: Qt 5 based tool for GPIO interaction. - Qt 5 based tool for GPIO interaction. +Description: Qt based tool for GPIO interaction. + Qt based tool for GPIO interaction. Package: libnymea-gpio-dev @@ -38,5 +39,5 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config, libnymea-gpio (= ${binary:Version}) -Description: Qt 5 based library for GPIO interaction - development files - Development files for Qt 5 based GPIO library. +Description: Qt based library for GPIO interaction - development files + Development files for Qt based GPIO library. diff --git a/debian/copyright b/debian-qt5/copyright similarity index 75% rename from debian/copyright rename to debian-qt5/copyright index 680ea0c..7a89709 100644 --- a/debian/copyright +++ b/debian-qt5/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Author: Simon Stürz -Download: https://github.com/guh/nymea-gpio +Download: https://github.com/nymea/nymea-gpio License: LGPL-3 On Debian systems, the complete text of the GNU General @@ -11,9 +11,9 @@ License: GPL-3 Public License can be found in `/usr/share/common-licenses/GPL-3'. Files: libnymea-gpio/* -Copyright: (C) 2019 - 2024 nymea GmbH +Copyright: (C) 2019 - 2025 nymea GmbH License: LGPL-3 Files: nymea-gpio-tool/* -Copyright: (C) 2019 - 2024 nymea GmbH +Copyright: (C) 2019 - 2025 nymea GmbH License: GPL-3 diff --git a/debian/libnymea-gpio-dev.install.in b/debian-qt5/libnymea-gpio-dev.install.in similarity index 100% rename from debian/libnymea-gpio-dev.install.in rename to debian-qt5/libnymea-gpio-dev.install.in diff --git a/debian/libnymea-gpio.install.in b/debian-qt5/libnymea-gpio.install.in similarity index 100% rename from debian/libnymea-gpio.install.in rename to debian-qt5/libnymea-gpio.install.in diff --git a/debian-qt5/nymea-gpio-tool.install.in b/debian-qt5/nymea-gpio-tool.install.in new file mode 100644 index 0000000..a36d5c7 --- /dev/null +++ b/debian-qt5/nymea-gpio-tool.install.in @@ -0,0 +1 @@ +usr/bin/nymea-gpio-tool diff --git a/debian/rules b/debian-qt5/rules similarity index 100% rename from debian/rules rename to debian-qt5/rules diff --git a/debian/source/format b/debian-qt5/source/format similarity index 100% rename from debian/source/format rename to debian-qt5/source/format diff --git a/debian-qt6/changelog b/debian-qt6/changelog new file mode 120000 index 0000000..98cdf8f --- /dev/null +++ b/debian-qt6/changelog @@ -0,0 +1 @@ +../debian-qt5/changelog \ No newline at end of file diff --git a/debian-qt6/compat b/debian-qt6/compat new file mode 100644 index 0000000..b1bd38b --- /dev/null +++ b/debian-qt6/compat @@ -0,0 +1 @@ +13 diff --git a/debian-qt6/control b/debian-qt6/control new file mode 100644 index 0000000..7374cf7 --- /dev/null +++ b/debian-qt6/control @@ -0,0 +1,42 @@ +Source: nymea-gpio +Section: utils +Priority: optional +Maintainer: nymea GmbH +Standards-Version: 4.7.2 +Vcs-Git: https://github.com/nymea/nymea-gpio.git +Build-Depends: debhelper, + dpkg-dev, + qt6-base-dev, + qt6-base-dev-tools, + + +Package: libnymea-gpio +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Qt based library for GPIO interaction. + Qt based library for GPIO interaction. + + +Package: nymea-gpio-tool +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-gpio (= ${binary:Version}) +Description: Qt based tool for GPIO interaction. + Qt based tool for GPIO interaction. + + +Package: libnymea-gpio-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends}, + pkg-config, + libnymea-gpio (= ${binary:Version}) +Description: Qt based library for GPIO interaction - development files + Development files for Qt based GPIO library. diff --git a/debian-qt6/copyright b/debian-qt6/copyright new file mode 120000 index 0000000..cc65877 --- /dev/null +++ b/debian-qt6/copyright @@ -0,0 +1 @@ +../debian-qt5/copyright \ No newline at end of file diff --git a/debian-qt6/libnymea-gpio-dev.install.in b/debian-qt6/libnymea-gpio-dev.install.in new file mode 120000 index 0000000..1ff86cd --- /dev/null +++ b/debian-qt6/libnymea-gpio-dev.install.in @@ -0,0 +1 @@ +../debian-qt5/libnymea-gpio-dev.install.in \ No newline at end of file diff --git a/debian-qt6/libnymea-gpio.install.in b/debian-qt6/libnymea-gpio.install.in new file mode 120000 index 0000000..925b1f9 --- /dev/null +++ b/debian-qt6/libnymea-gpio.install.in @@ -0,0 +1 @@ +../debian-qt5/libnymea-gpio.install.in \ No newline at end of file diff --git a/debian-qt6/nymea-gpio-tool.install.in b/debian-qt6/nymea-gpio-tool.install.in new file mode 120000 index 0000000..6c5c7d7 --- /dev/null +++ b/debian-qt6/nymea-gpio-tool.install.in @@ -0,0 +1 @@ +../debian-qt5/nymea-gpio-tool.install.in \ No newline at end of file diff --git a/debian-qt6/rules b/debian-qt6/rules new file mode 100755 index 0000000..97be1b7 --- /dev/null +++ b/debian-qt6/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +export DH_VERBOSE=1 + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +include /usr/share/dpkg/buildflags.mk + +PREPROCESS_FILES := $(wildcard debian/*.in) + +$(PREPROCESS_FILES:.in=): %: %.in + sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@ + +override_dh_install: $(PREPROCESS_FILES:.in=) + dh_install + +override_dh_auto_clean: + dh_auto_clean + rm -rf $(PREPROCESS_FILES:.in=) + +%: + dh $@ --buildsystem=qmake6 --parallel + diff --git a/debian-qt6/source b/debian-qt6/source new file mode 120000 index 0000000..1eac8ea --- /dev/null +++ b/debian-qt6/source @@ -0,0 +1 @@ +../debian-qt5/source \ No newline at end of file diff --git a/debian/nymea-gpio-tool.install.in b/debian/nymea-gpio-tool.install.in deleted file mode 100644 index e63d844..0000000 --- a/debian/nymea-gpio-tool.install.in +++ /dev/null @@ -1 +0,0 @@ -nymea-gpio-tool/nymea-gpio-tool usr/bin