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

[Carlos De Maine]

Git commit 0e555cdd86874af64bd041f1dd674eecca245aa8 by Carlos De Maine.
Committed on 30/08/2023 at 07:02.
Pushed by carlosdem into branch 'Neon/unstable'.

dual build

D  +0    -1    debian/compat
M  +38   -9    debian/control
A  +3    -0    debian/plasma-integration.install
A  +1    -0    debian/plasma-integration5.install
M  +15   -5    debian/rules

https://invent.kde.org/neon/kde/plasma-integration/-/commit/0e555cdd86874af64bd041f1dd674eecca245aa8

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 7260684..a6d44fc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ 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: breeze-dev (>= 4:5.13~),
-               cmake (>= 3.0~),
-               debhelper (>= 11~),
+Build-Depends: breeze-dev,
+               cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcolorscheme-dev,
                kf6-kconfig-dev,
@@ -18,6 +18,17 @@ Build-Depends: breeze-dev (>= 4:5.13~),
                kf6-kwayland-dev,
                kf6-kwidgetsaddons-dev,
                kf6-kwindowsystem-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kio-dev,
+               libkf5notifications-dev,
+               libkf5wayland-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               libqt5waylandclient5-dev,
+               libqt5x11extras5-dev,
                libwayland-dev,
                libxcursor-dev,
                pkg-config,
@@ -26,8 +37,13 @@ Build-Depends: breeze-dev (>= 4:5.13~),
                qt6-base-dev,
                qt6-declarative-dev,
                qt6-wayland-dev,
-               qt6-wayland-dev-tools
-Standards-Version: 4.1.4
+               qt6-wayland-dev-tools,
+               qtbase5-dev,
+               qtbase5-private-dev,
+               qtdeclarative5-dev,
+               qtquickcontrols2-5-dev,
+               qtwayland5-dev-tools,
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/workspace/plasma-integration
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/plasma-integration
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/plasma-integration.git
@@ -35,12 +51,25 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/plasma-integration.git
 Package: plasma-integration
 Architecture: any
 Depends: breeze,
-         kf6-qqc2-desktop-style
+         fonts-hack,
+         fonts-noto-cjk,
+         fonts-noto-color-emoji,
+         fonts-noto-core,
+         fonts-noto-ui-core,
+         kf6-qqc2-desktop-style,
+         xdg-desktop-portal-kde,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Qt Platform Theme integration plugins for KDE Plasma
+ A plugin to provide Qt Platform Theme integration for the Plasma
+ workspace.
+
+Package: plasma-integration5
+Architecture: any
+Depends: plasma-integration.
+         qml-module-org-kde-qqc2desktopstyle,
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: appstream-qt5 (<= 0.3.0+16.04.20151130-0ubuntu1)
-Recommends: fonts-hack, fonts-noto, xdg-desktop-portal-kde
 Description: Qt Platform Theme integration plugins for KDE Plasma
  A plugin to provide Qt Platform Theme integration for the Plasma
  workspace.
-Breaks: plasma-desktop (<< 4:5.14), plasma-workspace (<< 4:5.14)
diff --git a/debian/plasma-integration.install b/debian/plasma-integration.install
new file mode 100644
index 0000000..c837a19
--- /dev/null
+++ b/debian/plasma-integration.install
@@ -0,0 +1,3 @@
+usr/lib/*/qt6/plugins/
+usr/share/kconf_update/
+usr/share/locale/
diff --git a/debian/plasma-integration5.install b/debian/plasma-integration5.install
new file mode 100644
index 0000000..21152d1
--- /dev/null
+++ b/debian/plasma-integration5.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/plugins/
diff --git a/debian/rules b/debian/rules
index 91e9478..c164fe8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,25 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 # SPDX-License-Identifier: LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-CMAKE_ARGS = -DBUILD_QT6=ON -DBUILD_QT5=OFF
+QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON
+QT5_CMAKE_ARGS = -DBUILD_QT5=ON -DBUILD_QT6=OFF
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
 
+execute_after_dh_auto_clean:
+	rm -rf build-QT5
+
 override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKE_ARGS)
+	dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
+	dh_auto_configure --builddirectory=build-QT5 -- $(QT5_CMAKE_ARGS) -DUSE_QT_VERSION=5
+
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-QT5
 
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+override_dh_install:
+	dh_install
+	dh_auto_install --builddirectory=build-QT5