[neon/kde/libksysguard/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Tue Mar 14 01:11:15 GMT 2023
Git commit 115b1be82f1f2ce89fd37e057c1f845515f12840 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +38 -40 debian/control
M +4 -4 debian/libkf5sysguard-bin.install
M +7 -7 debian/libkf5sysguard-data.install
M +15 -15 debian/libkf5sysguard-dev.install
M +2 -2 debian/libksgrd9.install
M +2 -2 debian/libksignalplotter9.install
M +2 -2 debian/libksysguardformatter1.install
M +2 -2 debian/libksysguardsensorfaces1.install
M +2 -2 debian/libksysguardsensors1.install
M +3 -3 debian/libksysguardsystemstats1.install
M +2 -2 debian/liblsofui9.install
M +2 -2 debian/libprocesscore9.install
M +2 -2 debian/libprocessui9.install
M +2 -2 debian/qml-module-org-kde-ksysguard.install
M +6 -15 debian/rules
https://invent.kde.org/neon/kde/libksysguard/commit/115b1be82f1f2ce89fd37e057c1f845515f12840
diff --git a/debian/control b/debian/control
index 849c4e5..a11e672 100644
--- a/debian/control
+++ b/debian/control
@@ -5,35 +5,33 @@ 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),
debhelper (>= 9),
- extra-cmake-modules (>= 5.18.0~),
+ kf6-extra-cmake-modules,
+ kf6-kauth-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kdeclarative-dev,
+ kf6-kglobalaccel-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-knewstuff-dev,
+ kf6-kservice-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-plasma-framework-dev,
libcap-dev,
- libkf5auth-dev (>= 5.18.0~),
- libkf5completion-dev (>= 5.18.0~),
- libkf5config-dev (>= 5.18.0~),
- libkf5configwidgets-dev (>= 5.18.0~),
- libkf5coreaddons-dev (>= 5.18.0~),
- libkf5declarative-dev,
- libkf5globalaccel-dev,
- libkf5i18n-dev (>= 5.18.0~),
- libkf5iconthemes-dev (>= 5.18.0~),
- libkf5kio-dev,
- libkf5newstuff-dev,
- libkf5plasma-dev (>= 5.2.0),
- libkf5service-dev (>= 5.18.0~),
- libkf5widgetsaddons-dev (>= 5.18.0~),
- libkf5windowsystem-dev (>= 5.18.0~),
libnl-3-dev,
libnl-route-3-dev,
libpcap-dev,
- libqt5x11extras5-dev (>= 5.4),
libsensors4-dev,
libx11-dev,
libz-dev,
- pkg-kde-tools (>= 0.15.18~),
- qtbase5-dev (>= 5.4),
- qtscript5-dev (>= 5.4),
- qttools5-dev,
- qtwebengine5-dev,
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-tools-dev,
+ qt6-webengine-dev,
xauth,
xvfb,
zlib1g-dev
@@ -46,10 +44,10 @@ Package: libkf5sysguard-dev
Section: libdevel
Architecture: any
Multi-Arch: no
-Depends: libkf5config-dev,
- libkf5i18n-dev,
- libkf5iconthemes-dev,
- libkf5sysguard-bin (= ${binary:Version}),
+Depends: kf6-kconfig-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ libkf6sysguard-bin (= ${binary:Version}),
libksgrd9 (= ${binary:Version}),
libksignalplotter9 (= ${binary:Version}),
libksysguardsensorfaces1 (= ${binary:Version}),
@@ -58,7 +56,7 @@ Depends: libkf5config-dev,
liblsofui9 (= ${binary:Version}),
libprocesscore9 (= ${binary:Version}),
libprocessui9 (= ${binary:Version}),
- qtbase5-dev (>= 5.4),
+ qt6-base-dev,
${misc:Depends}
Conflicts: kde-workspace-dev
Description: library for monitoring your system - development files
@@ -70,7 +68,7 @@ Description: library for monitoring your system - development files
Package: libkf5sysguard-bin
Architecture: any
Multi-Arch: no
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: ksysguard (<< 4:5.21.80), libkf5sysguard5 (<< 4:5.4.2)
@@ -85,14 +83,14 @@ Package: libkf5sysguard5
Priority: optional
Section: oldlibs
Architecture: all
-Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
+Depends: libkf6sysguard-bin (>= ${source:Version}), ${misc:Depends}
Description: transitional dummy package
This is a transitional dummy package. It can safely be removed.
Package: libksgrd9
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: libksgrd7, libksgrd8
@@ -106,8 +104,8 @@ Description: library for monitoring your system - shared library
Package: libksignalplotter9
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-bin (= ${binary:Version}),
- libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-bin (= ${binary:Version}),
+ libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: libksignalplotter7, libksignalplotter8
@@ -121,7 +119,7 @@ Description: library for monitoring your system - shared library
Package: liblsofui9
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: liblsofui7, liblsofui8
@@ -135,7 +133,7 @@ Description: library for monitoring your system - shared library
Package: libprocesscore9
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: libprocesscore7, libprocesscore8
@@ -149,7 +147,7 @@ Description: library for monitoring your system - shared library
Package: libksysguardformatter1
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Description: library for monitoring your system - formatter shared library
@@ -161,7 +159,7 @@ Description: library for monitoring your system - formatter shared library
Package: libksysguardsensors1
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Description: library for monitoring your system - sensors shared library
@@ -173,7 +171,7 @@ Description: library for monitoring your system - sensors shared library
Package: libksysguardsensorfaces1
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Description: library for monitoring your system - sensor faces shared library
@@ -185,7 +183,7 @@ Description: library for monitoring your system - sensor faces shared library
Package: libksysguardsystemstats1
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Description: library for monitoring your system - sensor faces shared library
@@ -197,7 +195,7 @@ Description: library for monitoring your system - sensor faces shared library
Package: libprocessui9
Architecture: any
Multi-Arch: same
-Depends: libkf5sysguard-data (= ${source:Version}),
+Depends: libkf6sysguard-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: libprocessui7, libprocessui8
@@ -234,7 +232,7 @@ Package: libkf5sysguard5-data
Section: oldlibs
Priority: optional
Architecture: all
-Depends: libkf5sysguard-data (>= ${source:Version}), ${misc:Depends}
+Depends: libkf6sysguard-data (>= ${source:Version}), ${misc:Depends}
Description: transitional dummy package
This is a transitional dummy package. It can safely be removed.
diff --git a/debian/libkf5sysguard-bin.install b/debian/libkf5sysguard-bin.install
index b5de5f0..6c0796e 100644
--- a/debian/libkf5sysguard-bin.install
+++ b/debian/libkf5sysguard-bin.install
@@ -1,4 +1,4 @@
-usr/lib/*/libexec/ksysguard/ksgrd_network_helper
-usr/lib/*/qt5/plugins/ksysguard/process/ksysguard_plugin_network.so
-usr/lib/*/qt5/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
-usr/lib/kauth/libexec/ksysguardprocesslist_helper
+usr/kf6/lib/*/libexec/ksysguard/ksgrd_network_helper
+usr/kf6/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_network.so
+usr/kf6/lib/*/qt6/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
+usr/kf6/lib/kauth/libexec/ksysguardprocesslist_helper
diff --git a/debian/libkf5sysguard-data.install b/debian/libkf5sysguard-data.install
index d8d7ed0..0acb16d 100644
--- a/debian/libkf5sysguard-data.install
+++ b/debian/libkf5sysguard-data.install
@@ -1,7 +1,7 @@
-usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
-usr/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
-usr/share/knsrcfiles/
-usr/share/ksysguard/
-usr/share/locale/
-usr/share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
-usr/share/qlogging-categories5/libksysguard.categories
+usr/kf6/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
+usr/kf6/share/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+usr/kf6/share/knsrcfiles/
+usr/kf6/share/ksysguard/
+usr/kf6/share/locale/
+usr/kf6/share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
+usr/kf6/share/qlogging-categories5/libksysguard.categories
diff --git a/debian/libkf5sysguard-dev.install b/debian/libkf5sysguard-dev.install
index 93a2ea6..1e85f0e 100644
--- a/debian/libkf5sysguard-dev.install
+++ b/debian/libkf5sysguard-dev.install
@@ -1,15 +1,15 @@
-usr/include/ksysguard/
-usr/lib/*/cmake/KF5SysGuard/
-usr/lib/*/cmake/KSysGuard/
-usr/lib/*/libKSysGuardFormatter.so
-usr/lib/*/libKSysGuardSensorFaces.so
-usr/lib/*/libKSysGuardSensors.so
-usr/lib/*/libKSysGuardSystemStats.so
-usr/lib/*/libksgrd.so
-usr/lib/*/libksignalplotter.so
-usr/lib/*/liblsofui.so
-usr/lib/*/libprocesscore.so
-usr/lib/*/libprocessui.so
-usr/lib/*/qt5/plugins/designer/ksignalplotter5widgets.so
-usr/lib/*/qt5/plugins/designer/ksysguard5widgets.so
-usr/lib/*/qt5/plugins/designer/ksysguardlsof5widgets.so
+usr/kf6/include/ksysguard/
+usr/kf6/lib/*/cmake/KF5SysGuard/
+usr/kf6/lib/*/cmake/KSysGuard/
+usr/kf6/lib/*/libKSysGuardFormatter.so
+usr/kf6/lib/*/libKSysGuardSensorFaces.so
+usr/kf6/lib/*/libKSysGuardSensors.so
+usr/kf6/lib/*/libKSysGuardSystemStats.so
+usr/kf6/lib/*/libksgrd.so
+usr/kf6/lib/*/libksignalplotter.so
+usr/kf6/lib/*/liblsofui.so
+usr/kf6/lib/*/libprocesscore.so
+usr/kf6/lib/*/libprocessui.so
+usr/kf6/lib/*/qt6/plugins/designer/ksignalplotter5widgets.so
+usr/kf6/lib/*/qt6/plugins/designer/ksysguard5widgets.so
+usr/kf6/lib/*/qt6/plugins/designer/ksysguardlsof5widgets.so
diff --git a/debian/libksgrd9.install b/debian/libksgrd9.install
index aa87b47..4bf2781 100644
--- a/debian/libksgrd9.install
+++ b/debian/libksgrd9.install
@@ -1,2 +1,2 @@
-usr/lib/*/libksgrd.so.5.*
-usr/lib/*/libksgrd.so.9
+usr/kf6/lib/*/libksgrd.so.5.*
+usr/kf6/lib/*/libksgrd.so.9
diff --git a/debian/libksignalplotter9.install b/debian/libksignalplotter9.install
index 0139f00..db116fe 100644
--- a/debian/libksignalplotter9.install
+++ b/debian/libksignalplotter9.install
@@ -1,2 +1,2 @@
-usr/lib/*/libksignalplotter.so.5.*
-usr/lib/*/libksignalplotter.so.9
+usr/kf6/lib/*/libksignalplotter.so.5.*
+usr/kf6/lib/*/libksignalplotter.so.9
diff --git a/debian/libksysguardformatter1.install b/debian/libksysguardformatter1.install
index b601331..b46beb9 100644
--- a/debian/libksysguardformatter1.install
+++ b/debian/libksysguardformatter1.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKSysGuardFormatter.so.1
-usr/lib/*/libKSysGuardFormatter.so.5.*
+usr/kf6/lib/*/libKSysGuardFormatter.so.1
+usr/kf6/lib/*/libKSysGuardFormatter.so.5.*
diff --git a/debian/libksysguardsensorfaces1.install b/debian/libksysguardsensorfaces1.install
index e533bd2..4bafa0c 100644
--- a/debian/libksysguardsensorfaces1.install
+++ b/debian/libksysguardsensorfaces1.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKSysGuardSensorFaces.so.1
-usr/lib/*/libKSysGuardSensorFaces.so.5.*
+usr/kf6/lib/*/libKSysGuardSensorFaces.so.1
+usr/kf6/lib/*/libKSysGuardSensorFaces.so.5.*
diff --git a/debian/libksysguardsensors1.install b/debian/libksysguardsensors1.install
index a6e51e6..0021ada 100644
--- a/debian/libksysguardsensors1.install
+++ b/debian/libksysguardsensors1.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKSysGuardSensors.so.1
-usr/lib/*/libKSysGuardSensors.so.5*
+usr/kf6/lib/*/libKSysGuardSensors.so.1
+usr/kf6/lib/*/libKSysGuardSensors.so.5*
diff --git a/debian/libksysguardsystemstats1.install b/debian/libksysguardsystemstats1.install
index a4e6a09..08c3969 100644
--- a/debian/libksysguardsystemstats1.install
+++ b/debian/libksysguardsystemstats1.install
@@ -1,3 +1,3 @@
-usr/lib/*/libKSysGuardSystemStats.so.1
-usr/lib/*/libKSysGuardSystemStats.so.5*
-usr/share/dbus-1/interfaces/org.kde.ksystemstats.xml
+usr/kf6/lib/*/libKSysGuardSystemStats.so.1
+usr/kf6/lib/*/libKSysGuardSystemStats.so.5*
+usr/kf6/share/dbus-1/interfaces/org.kde.ksystemstats.xml
diff --git a/debian/liblsofui9.install b/debian/liblsofui9.install
index 928a3eb..688e1e8 100644
--- a/debian/liblsofui9.install
+++ b/debian/liblsofui9.install
@@ -1,2 +1,2 @@
-usr/lib/*/liblsofui.so.5.*
-usr/lib/*/liblsofui.so.9
+usr/kf6/lib/*/liblsofui.so.5.*
+usr/kf6/lib/*/liblsofui.so.9
diff --git a/debian/libprocesscore9.install b/debian/libprocesscore9.install
index e61b7b2..9437455 100644
--- a/debian/libprocesscore9.install
+++ b/debian/libprocesscore9.install
@@ -1,2 +1,2 @@
-usr/lib/*/libprocesscore.so.5.*
-usr/lib/*/libprocesscore.so.9
+usr/kf6/lib/*/libprocesscore.so.5.*
+usr/kf6/lib/*/libprocesscore.so.9
diff --git a/debian/libprocessui9.install b/debian/libprocessui9.install
index b1c7cb7..e272302 100644
--- a/debian/libprocessui9.install
+++ b/debian/libprocessui9.install
@@ -1,2 +1,2 @@
-usr/lib/*/libprocessui.so.5.*
-usr/lib/*/libprocessui.so.9
+usr/kf6/lib/*/libprocessui.so.5.*
+usr/kf6/lib/*/libprocessui.so.9
diff --git a/debian/qml-module-org-kde-ksysguard.install b/debian/qml-module-org-kde-ksysguard.install
index a13f937..930f5f4 100644
--- a/debian/qml-module-org-kde-ksysguard.install
+++ b/debian/qml-module-org-kde-ksysguard.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt5/plugins/kpackage/packagestructure/sensorface_packagestructure.so
-usr/lib/*/qt5/qml/org/kde/ksysguard/
+usr/kf6/lib/*/qt5/qml/org/kde/ksysguard/
+usr/kf6/lib/*/qt6/plugins/kpackage/packagestructure/sensorface_packagestructure.so
diff --git a/debian/rules b/debian/rules
index e5712a3..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,9 @@
#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-l10npkgs_firstversion_ok := 4:4.14.0-2
+%:
+ dh $@ --with kf6 --buildsystem kf6
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_strip:
- $(overridden_command) --dbg-package=libkf5sysguard-dbg
-
-override_dh_auto_test:
- # Disable dh_auto_test at build time
- :
-
-override_dh_installdeb:
- sed 's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/' \
- debian/libkf5sysguard-bin.postinst.in > debian/libkf5sysguard-bin.postinst
- dh_installdeb
+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