[neon/infrastructure/pangea-conf-projects] overrides: Revert "format and extraneous entries"

[Carlos De Maine]

Git commit 806b7e4746b52efa8f5d793718911e29f660dd69 by Carlos De Maine.
Committed on 13/01/2024 at 16:01.
Pushed by carlosdem into branch 'master'.

Revert "format and extraneous entries"

This reverts commit faec5ea74cbc84be8db116b25c61826328c3bc61.

M  +11   -13   overrides/base.yaml

https://invent.kde.org/neon/infrastructure/pangea-conf-projects/-/commit/806b7e4746b52efa8f5d793718911e29f660dd69

diff --git a/overrides/base.yaml b/overrides/base.yaml
index 500b90c..58b7e4a 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -2112,7 +2112,11 @@
 ### Frameworks 5 ###
 
 '*invent.kde.org/neon/kde/attica':
-  '{Neon/stable,Neon/unstable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
@@ -2137,7 +2141,7 @@
 
 '*invent.kde.org/neon/kde/frameworkintegration':
   '{Neon/stable,Neon/unstable}':
-    upstream_scm:
+  upstream_scm:
       type: git
       branch: kf5
 
@@ -2156,7 +2160,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
@@ -2412,6 +2416,7 @@
     upstream_scm:
       type: git
       branch: kf5
+  '{Neon/unstable,Neon/stable}':
 
 '*invent.kde.org/neon/kde/knotifications':
   '{Neon/stable,Neon/unstable}':
@@ -2554,7 +2559,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:
@@ -2726,16 +2731,11 @@
 
 # from neon-packaging
 '*invent.kde.org/neon/neon-packaging/kwayland6':
-  'Neon/stable':
+  '{Neon/stable,Neon/unstable}':
     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,18 +2795,17 @@
   '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
@@ -2863,7 +2862,6 @@
     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':