[neon/infrastructure/pangea-conf-projects] overrides: clean up kf5 crud
Carlos De Maine
null at kde.org
Wed Mar 26 07:04:42 GMT 2025
Git commit fe90c124a58ea4770e3046e09cd763d3f666e38e by Carlos De Maine.
Committed on 26/03/2025 at 06:18.
Pushed by carlosdem into branch 'master'.
clean up kf5 crud
M +68 -203 overrides/base.yaml
https://invent.kde.org/neon/infrastructure/pangea-conf-projects/-/commit/fe90c124a58ea4770e3046e09cd763d3f666e38e
diff --git a/overrides/base.yaml b/overrides/base.yaml
index e6f1cdc..78370c3 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -743,7 +743,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/graphics/kdiagram.git
- branch: 2.8
+ branch: 3.0
'*invent.kde.org/neon/neon-packaging/kdotool':
'*':
@@ -1115,7 +1115,7 @@
branch: master
url: https://invent.kde.org/frameworks/kcalendarcore.git
-'*invent.kde.org/neon/kf6/kf6-kcmutils':
+'*invent.kde.org/neon/kf6/kf6-kcmutils':kdiagram
'Neon/unstable':
upstream_scm:
type: git
@@ -2304,7 +2304,7 @@
'*invent.kde.org/neon/kde/kinit':
'Neon/unstable':
upstream_scm:
- type: git
+ type: gitkdiagram
branch: kf5
'Neon/stable':
upstream_scm:
@@ -2733,158 +2733,153 @@
'*invent.kde.org/neon/mobile/plasma-dialer':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/mobile/spacebar':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/bluedevil':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/breeze':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/breeze-grub':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/breeze-gtk':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/breeze-plymouth':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/drkonqi':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kactivitymanagerd':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kde-cli-tools':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kde-gtk-config':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kdecoration':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kdeplasma-addons':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kgamma5':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/khotkeys':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kinfocenter':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
-
-'*invent.kde.org/neon/kde/kirigami2':
- '*':
- upstream_scm:
- url: https://invent.kde.org/frameworks/kirigami.git
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kmenuedit':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/kpipewire':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kscreen':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kscreenlocker':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/ksshaskpass':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/ksysguard':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kwallet-pam':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kwin':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kwrited':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/libkscreen':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/libksysguard':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/milou':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/oxygen':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-desktop':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-discover':
'*':
@@ -2892,157 +2887,157 @@
url: https://invent.kde.org/plasma/discover.git
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-integration':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-nm':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-pa':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-sdk':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-vault':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-workspace':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-workspace-wallpapers':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plymouth-kcm':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/polkit-kde-agent-1':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/powerdevil':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/sddm-kcm':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/systemsettings':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/extras/wacomtablet':
'Neon/stable':
upstream_scm:
url: https://invent.kde.org/plasma/wacomtablet.git
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/xdg-desktop-portal-kde':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/kde/ksystemstats':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/kde/layer-shell-qt':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/oxygen-sounds':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/plasma-bigscreen':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-disks':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-firewall':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/plasma-systemmonitor':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/qqc2-breeze-style':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
'*invent.kde.org/neon/kde/kglobalacceld':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/ocean-sound-theme':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/plasma5support':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/plasma-activities':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/plasma-activities-stats':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/libplasma':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: Plasma/6.3
## plasma-bigscreen stuff that's still being ported to 6
#neon-packaging
@@ -3079,19 +3074,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/multimedia/ffmpegthumbs.git
- branch: release/24.12
-
-'*invent.kde.org/neon/neon-packaging/kdegraphics-mobipocket-5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/kdegraphics-mobipocket.git
- branch: master
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/kdegraphics-mobipocket.git
- branch: release/24.12
+ branch: release/25.04
'*invent.kde.org/neon/neon-packaging/kdegraphics-thumbnailers-5':
'Neon/unstable':
@@ -3103,7 +3086,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/graphics/kdegraphics-thumbnailers.git
- branch: release/24.12
+ branch: release/25.04
'*invent.kde.org/neon/kde/kwayland-integration':
'Neon/stable':
@@ -3120,12 +3103,12 @@
upstream_scm:
type: git
url: https://invent.kde.org/multimedia/libkcddb.git
- branch: master
+ branch: release/25.04
'Neon/stable':
upstream_scm:
type: git
url: https://invent.kde.org/multimedia/libkcddb.git
- branch: release/24.12
+ branch: release/25.04
'*invent.kde.org/neon/neon-packaging/libkdcraw5':
'Neon/unstable':
@@ -3137,7 +3120,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/graphics/libkdcraw.git
- branch: release/24.12
+ branch: release/25.04
'*invent.kde.org/neon/neon-packaging/libkexiv2-qt5':
'Neon/unstable':
@@ -3149,122 +3132,4 @@
upstream_scm:
type: git
url: https://invent.kde.org/graphics/libkexiv2.git
- branch: release/24.12
-
-# these kf5 bits are frozen
-'*invent.kde.org/neon/neon-packaging/audiocd-kio5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- branch: release/23.08
- url: https://invent.kde.org/multimedia/audiocd-kio.git
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/multimedia/audiocd-kio.git
- branch: release/23.08
- 'Neon/release':
- upstream_scm:
- type: tarball
- url: http://embra.edinburghlinux.co.uk/~jr/tmp/signond/audiocd-kio5-23.08.5.tar.xz
-
-'*invent.kde.org/neon/neon-packaging/baloo-widgets-5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- branch: release/24.08
- url: https://invent.kde.org/libraries/baloo-widgets.git
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/libraries/baloo-widgets.git
- branch: release/24.08
-
-'*invent.kde.org/neon/neon-packaging/kaccounts5-integration':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-integration.git
- branch: release/24.08
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-integration.git
- branch: release/24.08
-
-'*invent.kde.org/neon/neon-packaging/libkcompactdisc5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/multimedia/libkcompactdisc.git
- branch: release/24.08
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/multimedia/libkcompactdisc.git
- branch: release/24.08
-
-'*invent.kde.org/neon/neon-packaging/libkgapi5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- branch: release/23.08
- url: https://invent.kde.org/pim/libkgapi.git
- 'Neon/stable':
- upstream_scm:
- type: git
- branch: release/23.08
- url: https://invent.kde.org/pim/libkgapi.git
- 'Neon/release':
- upstream_scm:
- type: tarball
- url: http://embra.edinburghlinux.co.uk/~jr/tmp/signond/libkgapi5-23.08.5.tar.xz
-
-'*invent.kde.org/neon/neon-packaging/kio-extras5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kio-extras.git
- branch: release/23.08
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kio-extras.git
- branch: release/23.08
-
-'*invent.kde.org/neon/neon-packaging/kio-gdrive-5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kio-gdrive.git
- branch: release/24.08
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kio-gdrive.git
- branch: release/24.08
-
-'*invent.kde.org/neon/neon-packaging/libksane5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/libksane.git
- branch: release/24.08
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/libksane.git
- branch: release/24.08
-
-'*invent.kde.org/neon/neon-packaging/ksanecore5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/libraries/ksanecore.git
- branch: release/24.08
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/libraries/ksanecore.git
- branch: release/24.08
-
+ branch: release/25.04
More information about the Neon-commits
mailing list