[neon/infrastructure/pangea-conf-projects] overrides: clean from reverts

Carlos De Maine null at kde.org
Sat Jan 13 15:06:24 GMT 2024


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

clean from reverts

M  +610  -269  overrides/base.yaml

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

diff --git a/overrides/base.yaml b/overrides/base.yaml
index fd61cf7..9846677 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -1,5 +1,6 @@
 ## UScan releases ###
 
+
 '*invent.kde.org/neon/*':
   '{Neon/release}':
     upstream_scm:
@@ -257,14 +258,14 @@
       type: uscan
 
 '*invent.kde.org/neon/backports-jammy/libsignon-glib':
+  '{Neon/release}':
+    upstream_scm:
+      type: uscan
   '{Neon/unstable,Neon/stable}':
     upstream_scm:
       type: git
       url: https://gitlab.com/accounts-sso/libsignon-glib.git
       branch: master
-  '{Neon/release}':
-    upstream_scm:
-      type: uscan
 
 '*invent.kde.org/neon/backports-jammy/libsdl2':
   '*':
@@ -545,7 +546,11 @@
       branch: master
 
 '*invent.kde.org/neon/extras/ktechlab':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      url: https://invent.kde.org/sdk/ktechlab.git
+  'Neon/stable':
     upstream_scm:
       type: git
       url: https://invent.kde.org/sdk/ktechlab.git
@@ -1017,8 +1022,17 @@
       branch: develop
       type: git
 
-# in plasma overrides below
-#'*invent.kde.org/neon/neon-packaging/kwayland6':
+'*invent.kde.org/neon/neon-packaging/kwayland6':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: master
+      url: https://invent.kde.org/plasma/kwayland.git
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: Plasma/6.0
+      url: https://invent.kde.org/plasma/kwayland.git
 
 '*invent.kde.org/neon/neon-packaging/libetebase':
   '*':
@@ -1066,7 +1080,13 @@
       type: uscan
 
 '*invent.kde.org/neon/neon-packaging/libquotient':
-  '*':
+  'Neon/unstable':
+    upstream_scm:
+      type: uscan
+  'Neon/stable':
+    upstream_scm:
+      type: uscan
+  'Neon/release':
     upstream_scm:
       type: uscan
 
@@ -2123,400 +2143,671 @@
       branch: kf5
 
 '*invent.kde.org/neon/kde/baloo':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/bluez-qt':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-# now in kf6-breeze-icons
-#'*invent.kde.org/neon/kde/breeze-icons':
-
-# now in kf6-extra-cmake-modules
-#'*invent.kde.org/neon/kde/extra-cmake-modules':
-
-'*invent.kde.org/neon/kde/frameworkintegration':
-  '{Neon/unstable,Neon/stable}':
-  upstream_scm:
+  'Neon/stable':
+    upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kapidox':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/breeze-icons':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kactivities':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/extra-cmake-modules':
+  'Neon/unstable':
     upstream_scm:
       type: git
-      url: https://invent.kde.org/plasma/plasma-activities.git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kactivities-stats':
-  '{Neon/unstable,Neon/stable}':
-  upstream_scm:
+  'Neon/stable':
+    upstream_scm:
       type: git
-      url: https://invent.kde.org/plasma/plasma-activities-stats.git
       branch: kf5
 
-'*invent.kde.org/neon/kde/karchive':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/frameworkintegration':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kauth':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kbookmarks':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kapidox':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kcalendarcore':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kcmutils':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kactivities':
+  'Neon/unstable':
     upstream_scm:
       type: git
+      url: https://invent.kde.org/plasma/plasma-activities.git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kcodecs':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
+      url: https://invent.kde.org/plasma/plasma-activities.git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kcompletion':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kactivities-stats':
+  'Neon/unstable':
     upstream_scm:
       type: git
+      url: https://invent.kde.org/plasma/plasma-activities-stats.git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kconfig':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
+      url: https://invent.kde.org/plasma/plasma-activities-stats.git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kconfigwidgets':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/karchive':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kcontacts':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kcoreaddons':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kauth':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kcrash':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kdav':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kbookmarks':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kdbusaddons':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kdeclarative':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcalendarcore':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kded':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kdelibs4support':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcmutils':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kdesignerplugin':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kdesu':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcodecs':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kdewebkit':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kdnssd':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcompletion':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kdoctools':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kemoticons':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kconfig':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kfilemetadata':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kglobalaccel':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kconfigwidgets':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kguiaddons':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kholidays':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcontacts':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/khtml':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/ki18n':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcoreaddons':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kiconthemes':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kidletime':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kcrash':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kimageformats':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kinit':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdav':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kio':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kirigami':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdbusaddons':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kitemmodels':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kitemviews':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdeclarative':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kjobwidgets':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kjs':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kded':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kjsembed':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kmediaplayer':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdelibs4support':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/knewstuff':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/knotifications':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdesignerplugin':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/knotifyconfig':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kpackage':
+'*invent.kde.org/neon/kde/kdesu':
   'Neon/unstable':
-    '{Neon/unstable,Neon/stable}':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kparts':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kpeople':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdewebkit':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kplotting':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kpty':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kdnssd':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kdoctools':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kemoticons':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kfilemetadata':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kglobalaccel':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kguiaddons':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kholidays':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/khtml':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/ki18n':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kiconthemes':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kidletime':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kimageformats':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kinit':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kio':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kirigami':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kitemmodels':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kitemviews':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kjobwidgets':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kjs':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kjsembed':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kmediaplayer':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/knewstuff':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/knotifications':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/knotifyconfig':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kpackage':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kparts':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kpeople':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kplotting':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kpty':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/kquickcharts':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kross':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/krunner':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: kf5
+
+'*invent.kde.org/neon/kde/kservice':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kross':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/ktexteditor':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/krunner':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/kservice':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/ktextwidgets':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/ktexteditor':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
-'*invent.kde.org/neon/kde/ktextwidgets':
-  '{Neon/unstable,Neon/stable}':
+'*invent.kde.org/neon/kde/kunitconversion':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-'*invent.kde.org/neon/kde/kunitconversion':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/kwallet':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/kwayland':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/kwidgetsaddons':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
@@ -2532,25 +2823,41 @@
       branch: kf5
 
 '*invent.kde.org/neon/kde/kxmlgui':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/kxmlrpcclient':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/modemmanager-qt':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/networkmanager-qt':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
@@ -2562,69 +2869,100 @@
       branch: kf5
 
 '*invent.kde.org/neon/kde/plasma-framework':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      url: https://invent.kde.org/plasma/libplasma.git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       url: https://invent.kde.org/plasma/libplasma.git
       branch: kf5
   
 '*invent.kde.org/neon/kde/prison':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/purpose':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/qqc2-desktop-style':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/solid':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/sonnet':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/syndication':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/syntax-highlighting':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: kf5
+  'Neon/stable':
     upstream_scm:
       type: git
       branch: kf5
 
 '*invent.kde.org/neon/kde/threadweaver':
-  '{Neon/unstable,Neon/stable}':
+  'Neon/unstable':
     upstream_scm:
       type: git
       branch: kf5
-
-
-### Plasma overrides###
-
-# in neon-packaging
-# package is dead unless qt6 port is finished
-'*invent.kde.org/neon/neon-packaging/aura-browser':
   'Neon/stable':
     upstream_scm:
-      branch: Plasma/6.0
+      type: git
+      branch: kf5
+
+
+### Plasma ###
+#kde
 
 '*invent.kde.org/neon/kde/bluedevil':
   'Neon/stable':
@@ -2686,7 +3024,7 @@
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/kglobalacceld':
+'*invent.kde.org/neon/kde/khotkeys':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
@@ -2696,13 +3034,12 @@
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/kmenuedit':
-  'Neon/stable':
+'*invent.kde.org/neon/kde/kirigami2':
+  '*':
     upstream_scm:
-      branch: Plasma/6.0
+      url: https://invent.kde.org/frameworks/kirigami.git
 
-# in neon-packaging
-'*invent.kde.org/neon/neon-packaging/kpipewire':
+'*invent.kde.org/neon/kde/kmenuedit':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
@@ -2727,32 +3064,16 @@
     upstream_scm:
       branch: Plasma/6.0
 
-# in neon-packaging
-'*invent.kde.org/neon/kde/ksystemstats':
-  'Neon/stable':
-    upstream_scm:
-      branch: Plasma/6.0
-
 '*invent.kde.org/neon/kde/kwallet-pam':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/kwayland6':
-  '{Neon/unstable,Neon/stable}':
-    upstream_scm:
-      type: git
-      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:
@@ -2768,196 +3089,216 @@
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/layer-shell-qt':
+'*invent.kde.org/neon/kde/libkscreen':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/libkscreen':
+'*invent.kde.org/neon/kde/libksysguard':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/libksysguard':
+'*invent.kde.org/neon/kde/milou':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/libplasma':
+'*invent.kde.org/neon/kde/oxygen':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/milou':
+'*invent.kde.org/neon/kde/plasma-desktop':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/ocean-sound-theme':
+'*invent.kde.org/neon/kde/plasma-discover':
+  '*':
+    upstream_scm:
+      url: https://invent.kde.org/plasma/discover.git
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/oxygen':
+'*invent.kde.org/neon/kde/plasma-integration':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/oxygen-sounds':
+'*invent.kde.org/neon/kde/plasma-nm':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/plasma5support':
+'*invent.kde.org/neon/kde/plasma-pa':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/plasma-activities':
+
+'*invent.kde.org/neon/kde/plasma-sdk':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
-# from neon-packaging
-'*invent.kde.org/neon/neon-packaging/plasma-activities-stats':
+
+'*invent.kde.org/neon/kde/plasma-vault':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
-# from neon-packaging
 
-# from neon-packaging
-# package is dead unless qt6 port is finished
-'*invent.kde.org/neon/neon-packaging/plasma-bigscreen':
+'*invent.kde.org/neon/kde/plasma-workspace':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-desktop':
+'*invent.kde.org/neon/kde/plasma-workspace-wallpapers':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# redirect needed for unstable as name & repo don't match
-'*invent.kde.org/neon/kde/plasma-discover':
-  'Neon/unstable':
+'*invent.kde.org/neon/kde/plymouth-kcm':
+  'Neon/stable':
     upstream_scm:
-      url: https://invent.kde.org/plasma/discover.git
-      branch: master
+      branch: Plasma/6.0
+
+'*invent.kde.org/neon/kde/polkit-kde-agent-1':
   'Neon/stable':
     upstream_scm:
-      url: https://invent.kde.org/plasma/discover.git
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-disks':
+'*invent.kde.org/neon/kde/powerdevil':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-firewall':
+'*invent.kde.org/neon/kde/sddm-kcm':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-integration':
+'*invent.kde.org/neon/kde/systemsettings':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-nm':
+'*invent.kde.org/neon/extras/wacomtablet':
   'Neon/stable':
     upstream_scm:
+      url: https://invent.kde.org/plasma/wacomtablet.git
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-pa':
+'*invent.kde.org/neon/kde/xdg-desktop-portal-kde':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-# package is dead unless qt6 port is finished
-'*invent.kde.org/neon/neon-packaging/plank-player':
+
+#mobile
+
+'*invent.kde.org/neon/mobile/plasma-settings':
+  'Neon/stable':
+    upstream_scm:
+      branch: Plasma/5.27
+
+
+#neon-packaging
+
+#dead
+'*invent.kde.org/neon/neon-packaging/aura-browser':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# package is dead unless qt6 port is finished
-'*invent.kde.org/neon/neon-packaging/plasma-remotecontrollers':
+'*invent.kde.org/neon/neon-packaging/kpipewire':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/qqc2-breeze-style':
+'*invent.kde.org/neon/kde/ksystemstats':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-sdk':
+'*invent.kde.org/neon/kde/layer-shell-qt':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# from neon-packaging
-'*invent.kde.org/neon/kde/plasma-systemmonitor':
+'*invent.kde.org/neon/neon-packaging/oxygen-sounds':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-vault':
+#dead
+'*invent.kde.org/neon/neon-packaging/plank-player':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-workspace':
+#dead
+'*invent.kde.org/neon/neon-packaging/plasma-bigscreen':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plasma-workspace-wallpapers':
+'*invent.kde.org/neon/kde/plasma-disks':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/plymouth-kcm':
+'*invent.kde.org/neon/kde/plasma-firewall':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/polkit-kde-agent-1':
+# package is dead anyway
+'*invent.kde.org/neon/neon-packaging/plasma-remotecontrollers':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/powerdevil':
+'*invent.kde.org/neon/kde/plasma-systemmonitor':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/sddm-kcm':
+'*invent.kde.org/neon/kde/qqc2-breeze-style':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/systemsettings':
+'*invent.kde.org/neon/kde/kglobalacceld':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/extras/wacomtablet':
+'*invent.kde.org/neon/neon-packaging/ocean-sound-theme':
   'Neon/stable':
     upstream_scm:
-      url: https://invent.kde.org/plasma/wacomtablet.git
       branch: Plasma/6.0
 
-'*invent.kde.org/neon/kde/xdg-desktop-portal-kde':
+'*invent.kde.org/neon/neon-packaging/plasma5support':
   'Neon/stable':
     upstream_scm:
       branch: Plasma/6.0
 
-# mobile
-'*invent.kde.org/neon/mobile/plasma-settings':
+'*invent.kde.org/neon/neon-packaging/plasma-activities':
   'Neon/stable':
     upstream_scm:
-      branch: Plasma/5.27
+      branch: Plasma/6.0
+
+'*invent.kde.org/neon/neon-packaging/plasma-activities-stats':
+  'Neon/stable':
+    upstream_scm:
+      branch: Plasma/6.0
+
+'*invent.kde.org/neon/neon-packaging/libplasma':
+  'Neon/stable':
+    upstream_scm:
+      branch: Plasma/6.0
+
+'*invent.kde.org/neon/neon-packaging/kwayland6':
+  'Neon/stable':
+    upstream_scm:
+      branch: Plasma/6.0
\ No newline at end of file


More information about the Neon-commits mailing list