[neon/infrastructure/pangea-conf-projects] overrides: format and extraneous entries
Carlos De Maine
null at kde.org
Sat Jan 13 12:19:33 GMT 2024
Git commit faec5ea74cbc84be8db116b25c61826328c3bc61 by Carlos De Maine.
Committed on 13/01/2024 at 13:19.
Pushed by carlosdem into branch 'master'.
format and extraneous entries
M +13 -11 overrides/base.yaml
https://invent.kde.org/neon/infrastructure/pangea-conf-projects/-/commit/faec5ea74cbc84be8db116b25c61826328c3bc61
diff --git a/overrides/base.yaml b/overrides/base.yaml
index 58b7e4a..500b90c 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -2112,11 +2112,7 @@
### Frameworks 5 ###
'*invent.kde.org/neon/kde/attica':
- 'Neon/unstable':
- upstream_scm:
- type: git
- branch: kf5
- 'Neon/stable':
+ '{Neon/stable,Neon/unstable}':
upstream_scm:
type: git
branch: kf5
@@ -2141,7 +2137,7 @@
'*invent.kde.org/neon/kde/frameworkintegration':
'{Neon/stable,Neon/unstable}':
- upstream_scm:
+ upstream_scm:
type: git
branch: kf5
@@ -2160,7 +2156,7 @@
'*invent.kde.org/neon/kde/kactivities-stats':
'{Neon/stable,Neon/unstable}':
- upstream_scm:
+ upstream_scm:
type: git
url: https://invent.kde.org/plasma/plasma-activities-stats.git
branch: kf5
@@ -2416,7 +2412,6 @@
upstream_scm:
type: git
branch: kf5
- '{Neon/unstable,Neon/stable}':
'*invent.kde.org/neon/kde/knotifications':
'{Neon/stable,Neon/unstable}':
@@ -2559,7 +2554,7 @@
type: git
url: https://invent.kde.org/plasma/libplasma.git
branch: kf5
-
+
'*invent.kde.org/neon/kde/prison':
'{Neon/stable,Neon/unstable}':
upstream_scm:
@@ -2731,11 +2726,16 @@
# from neon-packaging
'*invent.kde.org/neon/neon-packaging/kwayland6':
- '{Neon/stable,Neon/unstable}':
+ 'Neon/stable':
upstream_scm:
type: git
branch: master
url: https://invent.kde.org/plasma/kwayland.git
+ 'Neon/unstable':
+ upstream_scm:
+ type: git
+ branch: Plasma/6.0
+ url: https://invent.kde.org/plasma/kwayland.git
'*invent.kde.org/neon/kde/kwin':
'Neon/stable':
@@ -2795,17 +2795,18 @@
'Neon/stable':
upstream_scm:
branch: Plasma/6.0
+
# from neon-packaging
'*invent.kde.org/neon/neon-packaging/plasma-activities':
'Neon/stable':
upstream_scm:
branch: Plasma/6.0
+
# from neon-packaging
'*invent.kde.org/neon/neon-packaging/plasma-activities-stats':
'Neon/stable':
upstream_scm:
branch: Plasma/6.0
-# from neon-packaging
# from neon-packaging
# package is dead unless qt6 port is finished
@@ -2862,6 +2863,7 @@
upstream_scm:
branch: Plasma/6.0
+# from neon-packaging
# package is dead unless qt6 port is finished
'*invent.kde.org/neon/neon-packaging/plasma-remotecontrollers':
'Neon/stable':
More information about the Neon-commits
mailing list