[neon/kde/plasma-discover/Neon/unstable] debian: port to kf6
Carlos De Maine
null at kde.org
Tue Mar 14 03:00:45 GMT 2023
Git commit b04097d2302df22474be36e8631ae35f62d68b16 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.
port to kf6
M +36 -38 debian/control
M +3 -3 debian/kde-config-updates.install
M +5 -5 debian/plasma-discover-backend-flatpak.install
M +7 -7 debian/plasma-discover-backend-snap.install
M +4 -4 debian/plasma-discover-common.install
M +16 -16 debian/plasma-discover.install
M +5 -27 debian/rules
https://invent.kde.org/neon/kde/plasma-discover/commit/b04097d2302df22474be36e8631ae35f62d68b16
diff --git a/debian/control b/debian/control
index df948d5..d728979 100644
--- a/debian/control
+++ b/debian/control
@@ -6,49 +6,47 @@ Uploaders: Maximiliano Curia <maxy at debian.org>,
Matthias Klumpp <mak at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 11~),
- extra-cmake-modules (>= 5.50.0~),
- kirigami2-dev (>= 5.42),
+ kf6-attica-dev,
+ kf6-extra-cmake-modules,
+ kf6-karchive-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-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-knewstuff-dev,
+ kf6-knotifications-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwallet-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kxmlgui-dev,
+ kf6-plasma-framework-dev,
+ kf6-purpose-dev,
+ kf6-solid-dev,
kuserfeedback-dev,
libappstreamqt-dev (>= 0.10.3),
libdebconf-kde-dev (>= 1.0.0),
libflatpak-dev (>= 0.10.2),
libfwupd-dev,
libjcat-dev,
- libkf5archive-dev (>= 5.50.0~),
- libkf5attica-dev (>= 5.23~),
- libkf5config-dev (>= 5.50.0~),
- libkf5configwidgets-dev (>= 5.16.0~),
- libkf5coreaddons-dev (>= 5.50.0~),
- libkf5crash-dev (>= 5.50.0~),
- libkf5dbusaddons-dev (>= 5.50.0~),
- libkf5declarative-dev (>= 5.42~),
- libkf5i18n-dev (>= 5.50.0~),
- libkf5iconthemes-dev (>= 5.16.0~),
- libkf5itemmodels-dev (>= 5.50.0~),
- libkf5itemviews-dev (>= 5.16.0~),
- libkf5kdelibs4support-dev (>= 5.34.0~),
- libkf5kio-dev (>= 5.50.0~),
- libkf5newstuff-dev (>= 5.23~),
- libkf5notifications-dev (>= 5.16.0~),
- libkf5plasma-dev (>= 5.16.0~),
- libkf5purpose-dev,
- libkf5solid-dev (>= 5.16.0~),
- libkf5textwidgets-dev,
- libkf5wallet-dev (>= 5.16.0~),
- libkf5widgetsaddons-dev (>= 5.16.0~),
- libkf5xmlgui-dev (>= 5.50.0~),
libmarkdown2-dev,
- libpackagekitqt5-dev (>= 1.0.1),
- libqca-qt5-2-dev,
- libqt5svg5-dev (>= 5.4.0~),
- libqt5webview5-dev,
- libqt5x11extras5-dev,
+ libpackagekitqt6-dev,
+ libqca-qt6-2-dev,
libsnapd-qt-dev (>= 1.30),
libsoup2.4-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.16),
- qtbase5-dev (>= 5.11.0~),
- qtdeclarative5-dev (>= 5.11.0~)
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-svg-dev,
+ qt6-webview-dev
Standards-Version: 4.1.4
Homepage: https://projects.kde.org/projects/kde/workspace/discover
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/plasma-discover
@@ -143,13 +141,13 @@ Package: plasma-discover-common
Architecture: all
Depends: ${misc:Depends}
Breaks: muon-common (<< 4:5.5.3a),
- plasma-discover (<< 5.15.0),
- plasma-discover-private (<< 5.15.0),
- plasma-discover-updater (<< 5.15.0)
+ plasma-discover (<< 5.15.0),
+ plasma-discover-private (<< 5.15.0),
+ plasma-discover-updater (<< 5.15.0)
Replaces: muon-common (<< 4:5.5.3a),
plasma-discover (<< 5.15.0),
- plasma-discover-private (<< 5.15.0),
- plasma-discover-updater (<< 5.15.0)
+ plasma-discover-private (<< 5.15.0),
+ plasma-discover-updater (<< 5.15.0)
Description: Discover software manager suite (common data files)
Discover is a graphical software manager for the Plasma workspace.
.
diff --git a/debian/kde-config-updates.install b/debian/kde-config-updates.install
index 8f9ab55..8495e1f 100644
--- a/debian/kde-config-updates.install
+++ b/debian/kde-config-updates.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_updates.so
-usr/share/applications/kcm_updates.desktop
-usr/share/kpackage/kcms/kcm_updates/contents/ui/main.qml
+usr/kf6/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_updates.so
+usr/kf6/share/applications/kcm_updates.desktop
+usr/kf6/share/kpackage/kcms/kcm_updates/contents/ui/main.qml
diff --git a/debian/plasma-discover-backend-flatpak.install b/debian/plasma-discover-backend-flatpak.install
index bd8f059..7b0c76d 100644
--- a/debian/plasma-discover-backend-flatpak.install
+++ b/debian/plasma-discover-backend-flatpak.install
@@ -1,5 +1,5 @@
-usr/lib/*/qt5/plugins/discover-notifier/FlatpakNotifier.so
-usr/lib/*/qt5/plugins/discover/flatpak-backend.so
-usr/share/applications/org.kde.discover-flatpak.desktop
-usr/share/icons/hicolor/scalable/apps/flatpak-discover.svg
-usr/share/libdiscover/categories/flatpak-backend-categories.xml
+usr/kf6/lib/*/qt6/plugins/discover-notifier/FlatpakNotifier.so
+usr/kf6/lib/*/qt6/plugins/discover/flatpak-backend.so
+usr/kf6/share/applications/org.kde.discover-flatpak.desktop
+usr/kf6/share/icons/hicolor/scalable/apps/flatpak-discover.svg
+usr/kf6/share/libdiscover/categories/flatpak-backend-categories.xml
diff --git a/debian/plasma-discover-backend-snap.install b/debian/plasma-discover-backend-snap.install
index 0b27b99..3110957 100644
--- a/debian/plasma-discover-backend-snap.install
+++ b/debian/plasma-discover-backend-snap.install
@@ -1,7 +1,7 @@
-usr/lib/*/libexec/discover/SnapMacaroonDialog
-usr/lib/*/qt5/plugins/discover/snap-backend.so
-usr/lib/kauth/libexec/libsnap_helper
-usr/share/dbus-1/system-services/org.kde.discover.libsnapclient.service
-usr/share/dbus-1/system.d/org.kde.discover.libsnapclient.conf
-usr/share/dbus-1/system.d/org.kde.discover.libsnapclient.conf
-usr/share/polkit-1/actions/org.kde.discover.libsnapclient.policy
+usr/kf6/lib/*/libexec/discover/SnapMacaroonDialog
+usr/kf6/lib/*/qt6/plugins/discover/snap-backend.so
+usr/kf6/lib/kauth/libexec/libsnap_helper
+usr/kf6/share/dbus-1/system-services/org.kde.discover.libsnapclient.service
+usr/kf6/share/dbus-1/system.d/org.kde.discover.libsnapclient.conf
+usr/kf6/share/dbus-1/system.d/org.kde.discover.libsnapclient.conf
+usr/kf6/share/polkit-1/actions/org.kde.discover.libsnapclient.policy
diff --git a/debian/plasma-discover-common.install b/debian/plasma-discover-common.install
index 80e3617..5afe2b4 100644
--- a/debian/plasma-discover-common.install
+++ b/debian/plasma-discover-common.install
@@ -1,4 +1,4 @@
-usr/share/icons/hicolor/*/apps/plasmadiscover.*
-usr/share/kxmlgui5/plasmadiscover/*
-usr/share/libdiscover/categories/packagekit-backend-categories.xml
-usr/share/locale/*
+usr/kf6/share/icons/hicolor/*/apps/plasmadiscover.*
+usr/kf6/share/kxmlgui5/plasmadiscover/*
+usr/kf6/share/libdiscover/categories/packagekit-backend-categories.xml
+usr/kf6/share/locale/*
diff --git a/debian/plasma-discover.install b/debian/plasma-discover.install
index cadf280..0cfe42c 100644
--- a/debian/plasma-discover.install
+++ b/debian/plasma-discover.install
@@ -1,17 +1,17 @@
etc/xdg/autostart/org.kde.discover.notifier.desktop
-usr/bin/plasma-discover
-usr/bin/plasma-discover-update
-usr/lib/*/libexec/DiscoverNotifier
-usr/lib/*/plasma-discover/*
-usr/lib/*/qt5/plugins/discover-notifier/DiscoverPackageKitNotifier.so
-usr/lib/*/qt5/plugins/discover/fwupd-backend.so
-usr/lib/*/qt5/plugins/discover/kns-backend.so
-usr/lib/*/qt5/plugins/discover/packagekit-backend.so
-usr/share/applications/org.kde.discover.apt.urlhandler.desktop
-usr/share/applications/org.kde.discover.desktop
-usr/share/applications/org.kde.discover.notifier.desktop
-usr/share/applications/org.kde.discover.snap.desktop
-usr/share/applications/org.kde.discover.urlhandler.desktop
-usr/share/knotifications5/*
-usr/share/metainfo/*
-usr/share/qlogging-categories5/discover.categories
+usr/kf6/bin/plasma-discover
+usr/kf6/bin/plasma-discover-update
+usr/kf6/lib/*/libexec/DiscoverNotifier
+usr/kf6/lib/*/plasma-discover/*
+usr/kf6/lib/*/qt6/plugins/discover-notifier/DiscoverPackageKitNotifier.so
+usr/kf6/lib/*/qt6/plugins/discover/fwupd-backend.so
+usr/kf6/lib/*/qt6/plugins/discover/kns-backend.so
+usr/kf6/lib/*/qt6/plugins/discover/packagekit-backend.so
+usr/kf6/share/applications/org.kde.discover.apt.urlhandler.desktop
+usr/kf6/share/applications/org.kde.discover.desktop
+usr/kf6/share/applications/org.kde.discover.notifier.desktop
+usr/kf6/share/applications/org.kde.discover.snap.desktop
+usr/kf6/share/applications/org.kde.discover.urlhandler.desktop
+usr/kf6/share/knotifications6/*
+usr/kf6/share/metainfo/*
+usr/kf6/share/qlogging-categories5/discover.categories
diff --git a/debian/rules b/debian/rules
index 844e760..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,9 @@
#!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://')
-
-PLASMA_DISCOVER_FLAGS = -DBUILD_FlatpakBackend=ON \
- -DBUILD_SnapBackend=ON
+# 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 -- $(PLASMA_DISCOVER_FLAGS)
-
-# Do not pull plugins into the shlibs file, it makes lintian angry.
-# This happens because dh_makeshlibs will look for sonames matching
-# (.*)-(.*)\.so where it assumes \1 is the library name and \2 is the version.
-# This will then assume that libfoo-backend.so has name 'libfoo' and version
-# 'backend' which makes for bogus, pointless, silly shlibs entries.
-# Couldn't be bothered to report this - sitter, 2015
-override_dh_makeshlibs:
- dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/discover* -V
-
-override_dh_missing:
- dh_missing --fail-missing
+ dh $@ --with kf6 --buildsystem kf6
-# FIXME: tests are broken at time
-override_dh_auto_test:
- :
+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