[neon/kde/kwayland-integration/Neon/unstable] debian: dual build

Carlos De Maine null at kde.org
Wed Aug 30 06:33:20 BST 2023


Git commit 74407c14aff029d4ebc3e03a662e858bbfdc53e7 by Carlos De Maine.
Committed on 30/08/2023 at 07:33.
Pushed by carlosdem into branch 'Neon/unstable'.

dual build

M  +20   -6    debian/control
A  +2    -0    debian/kwayland-integration.install
A  +1    -0    debian/kwayland-integration5.install
M  +17   -2    debian/rules

https://invent.kde.org/neon/kde/kwayland-integration/-/commit/74407c14aff029d4ebc3e03a662e858bbfdc53e7

diff --git a/debian/control b/debian/control
index 1e26297..e88e546 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,32 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12),
+Build-Depends: cmake,
                debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kguiaddons-dev,
                kf6-kidletime-dev,
                kf6-kwayland-dev,
                kf6-kwindowsystem-dev,
+               libkf5guiaddons-dev,
+               libkf5idletime-dev,
+               libkf5wayland-dev,
+               libkf5windowsystem-dev,
+               libqt5waylandclient5-dev,
                libwayland-dev,
                pkg-kde-tools-neon,
                plasma-wayland-protocols,
+               qtbase5-dev,
+               qtbase5-private-dev,
+               qtwayland5,
+               qtwayland5-dev-tools,
+               qtwayland5-private-dev,
                qt6-base-dev,
                qt6-wayland,
                qt6-wayland-dev,
                qt6-wayland-dev-tools,
                wayland-protocols
-Standards-Version: 4.1.3
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/workspace/kwayland-integration
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kwayland-integration
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwayland-integration.git
@@ -28,7 +38,11 @@ Architecture: any
 Multi-Arch: same
 Depends: qt6-wayland, ${misc:Depends}, ${shlibs:Depends}
 Description: kwayland runtime integration plugins
- Wayland runtime integration plugins for kidletime and kwindowsystem.
- .
- Contains development files for kwayland-integration.
-Breaks: kwin-wayland (<< 4:5.14), plasma-workspace-wayland (<< 4:5.14)
+ Wayland runtime integration plugins for plasma6.
+
+Package: kwayland-integration5
+Architecture: any
+Multi-Arch: same
+Depends: kwayland-integration, qtwayland5, ${misc:Depends}, ${shlibs:Depends}
+Description: kwayland runtime integration plugins
+ Wayland runtime integration plugins for plasma5.
diff --git a/debian/kwayland-integration.install b/debian/kwayland-integration.install
new file mode 100644
index 0000000..ff3c841
--- /dev/null
+++ b/debian/kwayland-integration.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt6/plugins/
+usr/share/qlogging-categories6/
diff --git a/debian/kwayland-integration5.install b/debian/kwayland-integration5.install
new file mode 100644
index 0000000..21152d1
--- /dev/null
+++ b/debian/kwayland-integration5.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/plugins/
diff --git a/debian/rules b/debian/rules
index 47c772a..b69b271 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,23 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
+QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON
+QT5_CMAKE_ARGS = -DBUILD_QT5=ON -DBUILD_QT6=OFF
+
 %:
 	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+execute_after_dh_auto_clean:
+	rm -rf build-QT5
+
+override_dh_auto_configure:
+	dh_auto_configure --builddirectory=build-QT5 -- $(QT5_CMAKE_ARGS) -DUSE_QT_VERSION=5
+	dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
+
+override_dh_auto_build:
+	dh_auto_build --builddirectory=build-QT5
+	dh_auto_build
+
+override_dh_install:
+	dh_auto_install --builddirectory=build-QT5
+	dh_install


More information about the Neon-commits mailing list