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

[Carlos De Maine]

Git commit 8a5f04067e2d156659d4532530c6b79cb8819b0d by Carlos De Maine.
Committed on 19/11/2024 at 09:03.
Pushed by carlosdem into branch 'master'.

more cleanups

M  +56   -61   overrides/base.yaml

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

diff --git a/overrides/base.yaml b/overrides/base.yaml
index 79d2dce..e7990af 100644
--- a/overrides/base.yaml
+++ b/overrides/base.yaml
@@ -1,6 +1,5 @@
 ## UScan releases ###
 
-
 '*invent.kde.org/neon/*':
   '{Neon/release}':
     upstream_scm:
@@ -27,7 +26,6 @@
     upstream_scm:
       type: uscan
 
-
 '*invent.kde.org/neon/3rdparty/sddm':
   'Neon/stable':
     upstream_scm:
@@ -476,9 +474,40 @@
 
 ### kde - because releaseme is busted
 '*invent.kde.org/neon/kde/kdeconnect':
-  '*':
+  'Neon/unstable':
+    upstream_scm:
+      url: https://invent.kde.org/network/kdeconnect-kde.git
+      branch: master
+  'Neon/stable':
     upstream_scm:
+      type: git
       url: https://invent.kde.org/network/kdeconnect-kde.git
+      branch: release/24.12
+
+      ## because releaseme is busted and needs removing
+'*invent.kde.org/neon/extras/kdevelop-python':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: master
+      url: https://invent.kde.org/kdevelop/kdev-python.git
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: release/24.12
+      url: https://invent.kde.org/kdevelop/kdev-python.git
+
+'*invent.kde.org/neon/extras/kdevelop-php':
+  'Neon/unstable':
+    upstream_scm:
+      type: git
+      branch: master
+      url: https://invent.kde.org/kdevelop/kdev-php.git
+  'Neon/stable':
+    upstream_scm:
+      type: git
+      branch: release/24.12
+      url: https://invent.kde.org/kdevelop/kdev-php.git
 
 
 ### Plasma-Mobile ###
@@ -613,15 +642,7 @@
 '*invent.kde.org/neon/neon-packaging/hotspot':
   '*':
     upstream_scm:
-      type: uscan
-
-'*invent.kde.org/neon/neon-packaging/kcm-tablet':
-  '*':
-    upstream_scm:
-      url: https://invent.kde.org/system/wacomtablet.git
-  'Neon/stable':
-    upstream_scm:
-      branch: master
+      type: uscanS
 
 '*invent.kde.org/neon/neon-packaging/kde-nomodeset':
   '*':
@@ -2740,7 +2761,6 @@
     upstream_scm:
       branch: Plasma/6.2
 
-
 '*invent.kde.org/neon/kde/kwin':
   'Neon/stable':
     upstream_scm:
@@ -2855,15 +2875,6 @@
     upstream_scm:
       branch: Plasma/6.2
 
-
-#neon-packaging
-#dead unless qt6 port finished
-# currently in neon-packaging
-'*invent.kde.org/neon/neon-packaging/aura-browser':
-  'Neon/stable':
-    upstream_scm:
-      branch: master
-
 # currently in neon-packaging
 '*invent.kde.org/neon/kde/ksystemstats':
   'Neon/stable':
@@ -2882,14 +2893,6 @@
     upstream_scm:
       branch: Plasma/6.2
 
-#dead unless qt6 port finished
-# currently in neon-packaging
-'*invent.kde.org/neon/neon-packaging/plank-player':
-  'Neon/stable':
-    upstream_scm:
-      branch: master
-
-#dead unless qt6 port finished
 # currently in neon-packaging
 '*invent.kde.org/neon/neon-packaging/plasma-bigscreen':
   'Neon/stable':
@@ -2906,13 +2909,6 @@
     upstream_scm:
       branch: Plasma/6.2
 
-#dead unless qt6 port finished
-# currently in neon-packaging
-'*invent.kde.org/neon/neon-packaging/plasma-remotecontrollers':
-  'Neon/stable':
-    upstream_scm:
-      branch: master
-
 '*invent.kde.org/neon/kde/plasma-systemmonitor':
   'Neon/stable':
     upstream_scm:
@@ -2958,6 +2954,29 @@
     upstream_scm:
       branch: Plasma/6.2
 
+## plasma-bigscreen stuff that's still being ported to 6
+#neon-packaging
+#dead unless qt6 port finished
+# currently in neon-packaging
+'*invent.kde.org/neon/neon-packaging/aura-browser':
+  'Neon/stable':
+    upstream_scm:
+      branch: master
+
+#dead unless qt6 port finished
+# currently in neon-packaging
+'*invent.kde.org/neon/neon-packaging/plank-player':
+  'Neon/stable':
+    upstream_scm:
+      branch: master
+
+#dead unless qt6 port finished
+# currently in neon-packaging
+'*invent.kde.org/neon/neon-packaging/plasma-remotecontrollers':
+  'Neon/stable':
+    upstream_scm:
+      branch: master
+
 ## bits and bobs to support kf5 apps in a  plasma 6 desktop
 # these are still moving targets
 '*invent.kde.org/neon/neon-packaging/ffmpegthumbs5':
@@ -3159,27 +3178,3 @@
       url: https://invent.kde.org/libraries/ksanecore.git
       branch: release/24.08
 
-## because releaseme is busted and needs removing
-'*invent.kde.org/neon/extras/kdevelop-python':  
-  'Neon/unstable':
-    upstream_scm:
-      type: git
-      branch: master
-      url: https://invent.kde.org/kdevelop/kdev-python.git
-  'Neon/stable':
-    upstream_scm:
-      type: git
-      branch: release/24.12
-      url: https://invent.kde.org/kdevelop/kdev-python.git
-
-'*invent.kde.org/neon/extras/kdevelop-php':
-  'Neon/unstable':
-    upstream_scm:
-      type: git
-      branch: master
-      url: https://invent.kde.org/kdevelop/kdev-php.git
-  'Neon/stable':
-    upstream_scm:
-      type: git
-      branch: release/24.12
-      url: https://invent.kde.org/kdevelop/kdev-php.git