[neon/kde/plasma-nm/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Tue Mar 14 02:51:53 GMT 2023


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

port to kf6

M  +28   -30   debian/control
M  +6    -6    debian/kde-config-mobile-networking.install
M  +33   -33   debian/plasma-nm.install
M  +5    -9    debian/rules

https://invent.kde.org/neon/kde/plasma-nm/commit/9f23917fbeaec465d4078e51fd38d29971e438b1

diff --git a/debian/control b/debian/control
index 6fb31a7..12ea514 100644
--- a/debian/control
+++ b/debian/control
@@ -5,43 +5,41 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 5.50.0~),
                gettext,
-               kinit-dev,
-               kirigami2-dev,
-               libkf5completion-dev (>= 5.50.0~),
-               libkf5configwidgets-dev (>= 5.50.0~),
-               libkf5coreaddons-dev (>= 5.50.0~),
-               libkf5dbusaddons-dev (>= 5.50.0~),
-               libkf5declarative-dev (>= 5.50.0~),
-               libkf5i18n-dev (>= 5.50.0~),
-               libkf5iconthemes-dev (>= 5.50.0~),
-               libkf5itemmodels-dev (>= 5.42.0~),
-               libkf5itemviews-dev,
-               libkf5kdelibs4support-dev (>= 5.37.0~),
-               libkf5kio-dev (>= 5.50.0~),
-               libkf5networkmanagerqt-dev (>= 5.50.0~),
-               libkf5notifications-dev (>= 5.50.0~),
-               libkf5plasma-dev (>= 5.50.0~),
-               libkf5prison-dev,
-               libkf5service-dev (>= 5.50.0~),
-               libkf5solid-dev (>= 5.50.0~),
-               libkf5wallet-dev (>= 5.50.0~),
-               libkf5widgetsaddons-dev (>= 5.50.0~),
-               libkf5windowsystem-dev (>= 5.50.0~),
-               libkf5xmlgui-dev,
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kirigami2-dev,
+               kf6-kitemmodels-dev,
+               kf6-kitemviews-dev,
+               kf6-knotifications-dev,
+               kf6-kservice-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-networkmanager-qt-dev,
+               kf6-plasma-framework-dev,
+               kf6-prison-dev,
+               kf6-solid-dev,
                libnm-dev (>= 1.4.0~),
                libopenconnect-dev (>= 3.99~),
-               libqca-qt5-2-dev (>= 2.1.0~),
-               qtwebengine5-dev,
+               libqca-qt6-2-dev,
                mobile-broadband-provider-info,
                modemmanager-dev (>= 1.0.0~),
                modemmanager-qt-dev (>= 5.50.0~),
                pkg-config,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.11.0~),
-               qtdeclarative5-dev (>= 5.11.0~),
-               qttools5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-tools-dev,
+               qt6-webengine-dev
 Standards-Version: 4.1.3
 Homepage: https://projects.kde.org/projects/kde/workspace/plasma-nm
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/plasma-nm
diff --git a/debian/kde-config-mobile-networking.install b/debian/kde-config-mobile-networking.install
index 6450612..6330023 100644
--- a/debian/kde-config-mobile-networking.install
+++ b/debian/kde-config-mobile-networking.install
@@ -1,6 +1,6 @@
-/usr/lib/*/qt5/plugins/kcms/kcm_mobile_hotspot.so
-/usr/lib/*/qt5/plugins/kcms/kcm_mobile_wifi.so
-/usr/share/kpackage/kcms/kcm_mobile_hotspot/
-/usr/share/kpackage/kcms/kcm_mobile_wifi
-/usr/share/locale/*/LC_MESSAGES/kcm_mobile_hotspot.mo
-/usr/share/locale/*/LC_MESSAGES/kcm_mobile_wifi.mo
+/usr/kf6/lib/*/qt6/plugins/kcms/kcm_mobile_hotspot.so
+/usr/kf6/lib/*/qt6/plugins/kcms/kcm_mobile_wifi.so
+/usr/kf6/share/kpackage/kcms/kcm_mobile_hotspot/
+/usr/kf6/share/kpackage/kcms/kcm_mobile_wifi
+/usr/kf6/share/locale/*/LC_MESSAGES/kcm_mobile_hotspot.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/kcm_mobile_wifi.mo
diff --git a/debian/plasma-nm.install b/debian/plasma-nm.install
index 46fe797..aa88302 100644
--- a/debian/plasma-nm.install
+++ b/debian/plasma-nm.install
@@ -1,33 +1,33 @@
-#/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_wireguardui.mo
-/usr/lib/*/libplasmanm_editor.so
-/usr/lib/*/libplasmanm_internal.so
-/usr/lib/*/qt5/plugins/kf5/kded/networkmanagement.so
-/usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_networkmanagement.so
-/usr/lib/*/qt5/plugins/plasma/network/vpn/
-/usr/lib/*/qt5/qml/org/kde/plasma/networkmanagement/libplasmanm_qmlplugins.so
-/usr/lib/*/qt5/qml/org/kde/plasma/networkmanagement/qmldir
-/usr/share/applications/kcm_networkmanagement.desktop
-/usr/share/kcm_networkmanagement/qml/AddConnectionDialog.qml
-/usr/share/kcm_networkmanagement/qml/ConfigurationDialog.qml
-/usr/share/kcm_networkmanagement/qml/ConnectionItem.qml
-/usr/share/kcm_networkmanagement/qml/ListItem.qml
-/usr/share/kcm_networkmanagement/qml/main.qml
-/usr/share/knotifications5/networkmanagement.notifyrc
-/usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.plasma.networkmanagement.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement-kcm.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement-kded.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement-libs.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_fortisslvpnui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_iodineui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_libreswanui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_sshui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_sstpui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
-/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo
-/usr/share/metainfo
-/usr/share/plasma
-/usr/share/qlogging-categories5/plasma-nm.categories
+#/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_wireguardui.mo
+/usr/kf6/lib/*/libplasmanm_editor.so
+/usr/kf6/lib/*/libplasmanm_internal.so
+/usr/kf6/lib/*/qt5/qml/org/kde/plasma/networkmanagement/libplasmanm_qmlplugins.so
+/usr/kf6/lib/*/qt5/qml/org/kde/plasma/networkmanagement/qmldir
+/usr/kf6/lib/*/qt6/plugins/kf6/kded/networkmanagement.so
+/usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_networkmanagement.so
+/usr/kf6/lib/*/qt6/plugins/plasma/network/vpn/
+/usr/kf6/share/applications/kcm_networkmanagement.desktop
+/usr/kf6/share/kcm_networkmanagement/qml/AddConnectionDialog.qml
+/usr/kf6/share/kcm_networkmanagement/qml/ConfigurationDialog.qml
+/usr/kf6/share/kcm_networkmanagement/qml/ConnectionItem.qml
+/usr/kf6/share/kcm_networkmanagement/qml/ListItem.qml
+/usr/kf6/share/kcm_networkmanagement/qml/main.qml
+/usr/kf6/share/knotifications6/networkmanagement.notifyrc
+/usr/kf6/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.plasma.networkmanagement.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement-kcm.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement-kded.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement-libs.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_fortisslvpnui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_iodineui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_libreswanui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_sshui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_sstpui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
+/usr/kf6/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo
+/usr/kf6/share/metainfo
+/usr/kf6/share/plasma
+/usr/kf6/share/qlogging-categories5/plasma-nm.categories
diff --git a/debian/rules b/debian/rules
index a59611c..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_MOBILE=true
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_strip:
-	dh_strip --dbgsym-migration='plasma-nm-dbg (<= 4:5.5.5-1~~)'
+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