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

Carlos De Maine null at kde.org
Sat Jan 13 11:53:57 GMT 2024


Git commit 47c841451ed9c59a9ef48ff2ee55562bdf90cf05 by Carlos De Maine.
Committed on 13/01/2024 at 12:53.
Pushed by carlosdem into branch 'master'.

more cleaning

M  +13   -18   overrides/base.yaml

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

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


More information about the Neon-commits mailing list