[neon/infrastructure/pangea-conf-projects] overrides: fix kf5 based plasma compat bits to correct versions
Carlos De Maine
null at kde.org
Mon Nov 18 03:49:32 GMT 2024
Git commit 9544eb44a13dab32f90e9743f940a0a46ac14c31 by Carlos De Maine.
Committed on 18/11/2024 at 03:49.
Pushed by carlosdem into branch 'master'.
fix kf5 based plasma compat bits to correct versions
M +69 -122 overrides/base.yaml
https://invent.kde.org/neon/infrastructure/pangea-conf-projects/-/commit/9544eb44a13dab32f90e9743f940a0a46ac14c31
diff --git a/overrides/base.yaml b/overrides/base.yaml
index e431351..9da8d45 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -864,11 +864,6 @@
upstream_scm:
url: https://invent.kde.org/network/kdeconnect-kde.git
-'*invent.kde.org/neon/extras/kraft':
- '*':
- upstream_scm:
- url: https://github.com/dragotin/kraft.git
-
'*invent.kde.org/neon/extras/kile':
'Neon/unstable':
upstream_scm:
@@ -3473,13 +3468,12 @@
#neon-packaging
-
#dead unless qt6 port finished
# currently in neon-packaging
'*invent.kde.org/neon/neon-packaging/aura-browser':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: master
# currently in neon-packaging
'*invent.kde.org/neon/kde/ksystemstats':
@@ -3504,7 +3498,7 @@
'*invent.kde.org/neon/neon-packaging/plank-player':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: master
#dead unless qt6 port finished
# currently in neon-packaging
@@ -3528,7 +3522,7 @@
'*invent.kde.org/neon/neon-packaging/plasma-remotecontrollers':
'Neon/stable':
upstream_scm:
- branch: Plasma/6.2
+ branch: master
'*invent.kde.org/neon/kde/plasma-systemmonitor':
'Neon/stable':
@@ -3576,35 +3570,7 @@
branch: Plasma/6.2
## bits and bobs to support kf5 apps in a plasma 6 desktop
-
-'*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: master
- 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.02
-
+# these are still moving targets
'*invent.kde.org/neon/neon-packaging/ffmpegthumbs5':
'Neon/unstable':
upstream_scm:
@@ -3615,31 +3581,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/multimedia/ffmpegthumbs.git
- branch: release/24.02
-
-'*invent.kde.org/neon/neon-packaging/kaccounts5-integration':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-integration.git
- branch: master
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-integration.git
- branch: release/24.02
-
-'*invent.kde.org/neon/neon-packaging/kaccounts5-providers':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-providers.git
- branch: master
- 'Neon/stable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-providers.git
- branch: release/24.02
+ branch: release/24.12
'*invent.kde.org/neon/neon-packaging/kdegraphics-mobipocket-5':
'Neon/unstable':
@@ -3651,7 +3593,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/graphics/kdegraphics-mobipocket.git
- branch: release/24.02
+ branch: release/24.12
'*invent.kde.org/neon/neon-packaging/kdegraphics-thumbnailers-5':
'Neon/unstable':
@@ -3663,154 +3605,159 @@
upstream_scm:
type: git
url: https://invent.kde.org/graphics/kdegraphics-thumbnailers.git
- branch: release/24.02
+ branch: release/24.12
-'*invent.kde.org/neon/neon-packaging/kio-admin5':
- 'Neon/unstable':
+'*invent.kde.org/neon/kde/kwayland-integration':
+ 'Neon/stable':
upstream_scm:
- type: git
- url: https://invent.kde.org/system/kio-admin.git
- branch: master
+ branch: Plasma/5.27
+
+'*invent.kde.org/neon/kde/kwayland-server':
'Neon/stable':
upstream_scm:
- type: git
- url: https://invent.kde.org/system/kio-admin.git
- branch: release/24.02
+ branch: Plasma/5.27
-'*invent.kde.org/neon/neon-packaging/kio-gdrive-5':
+'*invent.kde.org/neon/neon-packaging/libkcddb5':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/network/kio-gdrive.git
+ url: https://invent.kde.org/multimedia/libkcddb.git
branch: master
- '*invent.kde.org/neon/neon-packaging/kio-gdrive-5':
'Neon/stable':
upstream_scm:
type: git
- url: https://invent.kde.org/network/kio-gdrive.git
- branch: release/24.02
+ url: https://invent.kde.org/multimedia/libkcddb.git
+ branch: release/24.12
-'*invent.kde.org/neon/neon-packaging/kio-fuse-5':
+'*invent.kde.org/neon/neon-packaging/libkdcraw5':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/system/kio-fuse.git
+ url: https://invent.kde.org/graphics/libkdcraw.git
branch: master
'Neon/stable':
upstream_scm:
type: git
- url: https://invent.kde.org/system/kio-fuse.git
- branch: master
+ url: https://invent.kde.org/graphics/libkdcraw.git
+ branch: release/24.12
-'*invent.kde.org/neon/neon-packaging/kio-zeroconf-5':
+'*invent.kde.org/neon/neon-packaging/libkexiv2-qt5':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/network/kio-zeroconf.git
+ url: https://invent.kde.org/graphics/libkexiv2.git
branch: master
'Neon/stable':
upstream_scm:
type: git
- url: https://invent.kde.org/network/kio-zeroconf.git
- branch: release/24.02
-
-'*invent.kde.org/neon/kde/kwayland-integration':
- 'Neon/stable':
- upstream_scm:
- branch: Plasma/5.27
-
-'*invent.kde.org/neon/kde/kwayland-server':
- 'Neon/stable':
- upstream_scm:
- branch: Plasma/5.27
+ url: https://invent.kde.org/graphics/libkexiv2.git
+ branch: release/24.12
-'*invent.kde.org/neon/neon-packaging/libkcddb5':
+# these kf5 bits are frozen
+'*invent.kde.org/neon/neon-packaging/audiocd-kio5':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/multimedia/libkcddb.git
- branch: master
+ 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/libkcddb.git
- branch: release/24.02
+ 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/libkcompactdisc5':
+'*invent.kde.org/neon/neon-packaging/baloo-widgets-5':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/multimedia/libkcompactdisc.git
- branch: master
+ branch: release/24.08
+ url: https://invent.kde.org/libraries/baloo-widgets.git
'Neon/stable':
upstream_scm:
type: git
- url: https://invent.kde.org/multimedia/libkcompactdisc.git
- branch: release/24.02
+ url: https://invent.kde.org/libraries/baloo-widgets.git
+ branch: release/24.08
-'*invent.kde.org/neon/neon-packaging/libkdcraw5':
+'*invent.kde.org/neon/neon-packaging/kaccounts5-integration':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/graphics/libkdcraw.git
- branch: master
+ url: https://invent.kde.org/network/kaccounts-integration.git
+ branch: release/24.08
'Neon/stable':
upstream_scm:
type: git
- url: https://invent.kde.org/graphics/libkdcraw.git
- branch: release/24.02
+ url: https://invent.kde.org/network/kaccounts-integration.git
+ branch: release/24.08
-'*invent.kde.org/neon/neon-packaging/libkexiv2-qt5':
+'*invent.kde.org/neon/neon-packaging/libkcompactdisc5':
'Neon/unstable':
upstream_scm:
type: git
- url: https://invent.kde.org/graphics/libkexiv2.git
- branch: master
+ url: https://invent.kde.org/multimedia/libkcompactdisc.git
+ branch: release/24.08
'Neon/stable':
upstream_scm:
type: git
- url: https://invent.kde.org/graphics/libkexiv2.git
- branch: release/24.02
+ 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
+ branch: kf5
url: https://invent.kde.org/pim/libkgapi.git
'Neon/stable':
upstream_scm:
type: git
- branch: release/23.08
+ branch: kf5
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-gdrive-5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/network/kio-gdrive.git
+ branch: release/24.08
+ '*invent.kde.org/neon/neon-packaging/kio-gdrive-5':
+ '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: master
+ branch: release/24.08
'Neon/stable':
upstream_scm:
type: git
url: https://invent.kde.org/graphics/libksane.git
- branch: release/24.02
+ 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: master
+ branch: release/24.08
'Neon/stable':
upstream_scm:
type: git
url: https://invent.kde.org/libraries/ksanecore.git
- branch: release/24.02
+ branch: release/24.08
## because releaseme is busted and needs removing
'*invent.kde.org/neon/extras/kdevelop-python':
More information about the Neon-commits
mailing list