[neon/infrastructure/pangea-conf-projects] overrides: Revert "more cleaning"

[Carlos De Maine]

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

Revert "more cleaning"

This reverts commit 47c841451ed9c59a9ef48ff2ee55562bdf90cf05.

M  +18   -13   overrides/base.yaml

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

diff --git a/overrides/base.yaml b/overrides/base.yaml
index 58b7e4a..1a6a2a4 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -2550,8 +2550,11 @@
       type: git
       branch: kf5
 
-# now in kf6-breeze-icons
-#'*invent.kde.org/neon/kde/oxygen-icons':
+'*invent.kde.org/neon/kde/oxygen-icons':
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
 
 '*invent.kde.org/neon/kde/plasma-framework':
   '{Neon/stable,Neon/unstable}':
@@ -2719,6 +2722,7 @@
     upstream_scm:
       branch: Plasma/6.0
 
+# in neon-packaging
 '*invent.kde.org/neon/kde/ksystemstats':
   'Neon/stable':
     upstream_scm:
@@ -2737,6 +2741,18 @@
       branch: master
       url: https://invent.kde.org/plasma/kwayland.git
 
+# plasma 5 only
+'*invent.kde.org/neon/kde/kwayland-integration':
+  'Neon/stable':
+    upstream_scm:
+      branch: Plasma/5.27
+
+# plasma 5 only
+'*invent.kde.org/neon/kde/kwayland-server':
+  'Neon/stable':
+    upstream_scm:
+      branch: Plasma/5.27
+
 '*invent.kde.org/neon/kde/kwin':
   'Neon/stable':
     upstream_scm:
@@ -2935,17 +2951,6 @@
     upstream_scm:
       branch: Plasma/6.0
 
-### plasma 5 compatibility
-'*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
-
 # mobile
 '*invent.kde.org/neon/mobile/plasma-settings':
   'Neon/stable':