[neon/neon-packaging/kpipewire/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Tue Mar 14 01:16:53 GMT 2023


Git commit 56143b0117c8d1e8f7c63137d8362fbeef31eb95 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +10   -11   debian/control
M  +5    -5    debian/libkpipewire-dev.install
M  +3    -3    debian/libkpipewire5.install
M  +1    -1    debian/libkpipewirerecord5.install
M  +1    -1    debian/qml-module-org-kde-pipewire.install
M  +6    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/kpipewire/commit/56143b0117c8d1e8f7c63137d8362fbeef31eb95

diff --git a/debian/control b/debian/control
index f699653..5476766 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,10 @@ Priority: optional
 Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.94~),
+               kf6-extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kwayland-dev,
                libavcodec-dev,
                libavformat-dev,
                libavutil-dev,
@@ -12,19 +15,15 @@ Build-Depends: cmake (>= 3.16~),
                libegl1-mesa-dev,
                libepoxy-dev (>= 1.3~),
                libgbm-dev,
-               libkf5coreaddons-dev (>= 5.37.0~),
-               libkf5i18n-dev (>= 5.37.0~),
-               libkf5wayland-dev (>= 5.37.0~),
                libpipewire-0.3-dev,
-               libqt5waylandclient5-dev,
                libswscale-dev,
                libwayland-dev,
-               pkg-kde-tools,
+               pkg-kde-tools-neon,
                plasma-wayland-protocols,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtdeclarative5-dev,
-               qtwayland5-dev-tools
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-wayland-dev,
+               qt6-wayland-dev-tools
 Standards-Version: 4.6.0
 Homepage: https://invent.kde.org/plasma/kpipewire
 Vcs-Browser: https://invent.kde.org/neon/neon-packaging/kpipewire
@@ -36,7 +35,7 @@ Section: libdevel
 Architecture: any
 Depends: libkpipewire5 (= ${binary:Version}),
          libkpipewirerecord5 (= ${binary:Version}),
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends}
 Description: KDE's Pipewire library
  Components for rendering and recording PipeWire streams using Qt.
diff --git a/debian/libkpipewire-dev.install b/debian/libkpipewire-dev.install
index dbeb675..ee54a0a 100644
--- a/debian/libkpipewire-dev.install
+++ b/debian/libkpipewire-dev.install
@@ -1,5 +1,5 @@
-usr/include/
-usr/lib/*/cmake/
-usr/lib/*/libKPipeWire.so
-usr/lib/*/libKPipeWireRecord.so
-usr/share/qlogging-categories5/
+usr/kf6/include/
+usr/kf6/lib/*/cmake/
+usr/kf6/lib/*/libKPipeWire.so
+usr/kf6/lib/*/libKPipeWireRecord.so
+usr/kf6/share/qlogging-categories5/
diff --git a/debian/libkpipewire5.install b/debian/libkpipewire5.install
index 9d68ed9..12189ec 100644
--- a/debian/libkpipewire5.install
+++ b/debian/libkpipewire5.install
@@ -1,3 +1,3 @@
-usr/lib/*/libKPipeWire.so.5*
-usr/lib/*/libKPipeWireDmaBuf.so*
-usr/share/locale/*/LC_MESSAGES/kpipewire5.mo
+usr/kf6/lib/*/libKPipeWire.so.5*
+usr/kf6/lib/*/libKPipeWireDmaBuf.so*
+usr/kf6/share/locale/*/LC_MESSAGES/kpipewire5.mo
diff --git a/debian/libkpipewirerecord5.install b/debian/libkpipewirerecord5.install
index 1a35595..4181c94 100644
--- a/debian/libkpipewirerecord5.install
+++ b/debian/libkpipewirerecord5.install
@@ -1 +1 @@
-usr/lib/*/libKPipeWireRecord.so.5*
+usr/kf6/lib/*/libKPipeWireRecord.so.5*
diff --git a/debian/qml-module-org-kde-pipewire.install b/debian/qml-module-org-kde-pipewire.install
index 39546bb..ab525cc 100644
--- a/debian/qml-module-org-kde-pipewire.install
+++ b/debian/qml-module-org-kde-pipewire.install
@@ -1 +1 @@
-usr/lib/*/qt5/qml/
+usr/kf6/lib/*/qt5/qml/
diff --git a/debian/rules b/debian/rules
index 28858f7..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list