[neon/infrastructure/pangea-conf-projects] overrides: begin to sort out kf5 deps needed in a plasma 6 desktop
Carlos De Maine
null at kde.org
Mon Jan 15 23:48:45 GMT 2024
Git commit 29c3ac0348d8eadb93a1879cecc8b03f8bd14711 by Carlos De Maine.
Committed on 16/01/2024 at 00:34.
Pushed by carlosdem into branch 'master'.
begin to sort out kf5 deps needed in a plasma 6 desktop
M +136 -78 overrides/base.yaml
https://invent.kde.org/neon/infrastructure/pangea-conf-projects/-/commit/29c3ac0348d8eadb93a1879cecc8b03f8bd14711
diff --git a/overrides/base.yaml b/overrides/base.yaml
index a9d9c25..e94fa9c 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -649,7 +649,7 @@
upstream_scm:
type: git
url: https://invent.kde.org/network/kaidan.git
- branch: Kaidan/0.9
+ branch: Kaidgit clone https://invent.kde.org/neon/infrastructure/pangea-conf-projects.gitan/0.9
'Neon/release':
upstream_scm:
type: tarball
@@ -788,13 +788,6 @@
### Neon-packaging ###
-'*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
-
'*invent.kde.org/neon/neon-packaging/aws-sdk-cpp':
'*':
upstream_scm:
@@ -802,12 +795,6 @@
url: https://github.com/aws/aws-sdk-cpp.git
branch: main
-'*invent.kde.org/neon/neon-packaging/baloo-widgets6':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/libraries/baloo-widgets.git
-
'*invent.kde.org/neon/neon-packaging/black-hole-solver':
'*':
upstream_scm:
@@ -855,13 +842,6 @@
upstream_scm:
type: uscan
-'*invent.kde.org/neon/neon-packaging/ffmpegthumbs5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/multimedia/ffmpegthumbs.git
- branch: release/23.08
-
'*invent.kde.org/neon/neon-packaging/hotspot':
'Neon/{release,stable,unstable}':
upstream_scm:
@@ -872,33 +852,6 @@
url: https://github.com/KDAB/hotspot.git
branch: master
-'*invent.kde.org/neon/neon-packaging/kaccounts5-integration':
- 'Neon/{stable,unstable}':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-integration.git
- branch: release/23.08
-
-'*invent.kde.org/neon/neon-packaging/kaccounts5-providers':
- 'Neon/{stable,unstable}':
- upstream_scm:
- type: git
- url: https://invent.kde.org/network/kaccounts-providers.git
- branch: release/23.08
-
-'*invent.kde.org/neon/neon-packaging/kio-admin5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/system/kio-admin.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/23.08
'*invent.kde.org/neon/neon-packaging/kcm-tablet':
'*':
@@ -1039,36 +992,6 @@
upstream_scm:
type: uscan
-'*invent.kde.org/neon/neon-packaging/libkcddb5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/multimedia/libkcddb.git
-
-'*invent.kde.org/neon/neon-packaging/libkcompactdisc5':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/multimedia/libkcompactdisc.git
-
-'*invent.kde.org/neon/neon-packaging/libkdcraw6':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/libkdcraw.git
-
-'*invent.kde.org/neon/neon-packaging/libkexiv2-6':
- 'Neon/{stable,unstable}':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/libkexiv2.git
-
-'*invent.kde.org/neon/neon-packaging/libksane6':
- 'Neon/unstable':
- upstream_scm:
- type: git
- url: https://invent.kde.org/graphics/libksane.git
-
'*invent.kde.org/neon/neon-packaging/libmsym':
'Neon/unstable':
upstream_scm:
@@ -3297,3 +3220,138 @@
'Neon/stable':
upstream_scm:
branch: Plasma/6.0
+
+## plasma 5 bits and bobs for 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
+
+'*invent.kde.org/neon/neon-packaging/baloo-widgets-5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ branch: release/23.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/23.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/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/network/kaccounts-integration.git
+ branch: release/23.08
+
+'*invent.kde.org/neon/neon-packaging/kaccounts5-providers':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/network/kaccounts-providers.git
+ branch: release/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/network/kaccounts-providers.git
+ branch: release/23.08
+
+'*invent.kde.org/neon/neon-packaging/kio-admin5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/system/kio-admin.git
+ branch: release/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/system/kio-admin.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/23.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/23.08
+
+'*invent.kde.org/neon/neon-packaging/libkcddb5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/multimedia/libkcddb.git
+ branch: release/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/multimedia/libkcddb.git
+ branch: release/23.08
+
+'*invent.kde.org/neon/neon-packaging/libkcompactdisc5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/multimedia/libkcompactdisc.git
+ branch: release/23.08
+ Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/multimedia/libkcompactdisc.git
+ branch: release/23.08
+
+'*invent.kde.org/neon/neon-packaging/libkdcraw5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/graphics/libkdcraw.git
+ branch: release/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/graphics/libkdcraw.git
+ branch: release/23.08
+
+'*invent.kde.org/neon/neon-packaging/libkexiv2-5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/graphics/libkexiv2.git
+ branch: release/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/graphics/libkexiv2.git
+ branch: release/23.08
+
+'*invent.kde.org/neon/neon-packaging/libksane5':
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/graphics/libksane.git
+ branch: release/23.08
+ 'Neon/stable':
+ upstream_scm:
+ type: git
+ url: https://invent.kde.org/graphics/libksane.git
+ branch: release/23.08
More information about the Neon-commits
mailing list