[neon/neon/seeds/Neon/release] /: merge neon/stable

[Jonathan Esk-Riddell]

Git commit b421de5a1401c8c477c261585f9661c57aab85c2 by Jonathan Esk-Riddell.
Committed on 26/02/2024 at 10:05.
Pushed by jriddell into branch 'Neon/release'.

merge neon/stable

M  +6    -2    all
M  +32   -17   desktop
M  +1    -1    update.cfg

https://invent.kde.org/neon/neon/seeds/-/commit/b421de5a1401c8c477c261585f9661c57aab85c2

diff --cc all
index d38d814,96ce1d4..c1df54e
--- a/all
+++ b/all
@@@ -136,7 -136,7 +136,6 @@@ Task-Test-new-install: skip sho
   * partitionmanager
   * konversation
   * kdevelop
-- * muon
   * skrooge
   * skanlite
   * kio-gdrive
@@@ -155,8 -155,13 +154,12 @@@
   * muon
   * skanlite
   * skrooge
+  * zanshin
+  * ruqola
 - * babe
+  * elisa
   * gammaray
   * heaptrack
+  * isoimagewriter
   * kio-stash
   * kronometer
   * labplot
@@@ -181,5 -187,5 +185,5 @@@
  
  == Plasma ==
  
-  * khotkeys
   * plasma-vault
++ * plasma-pass
diff --cc desktop
index 959881a,22dc45c..72ca5d0
--- a/desktop
+++ b/desktop
@@@ -109,7 -126,7 +126,6 @@@ Fonts
   * (firefox) # needs GTK fixed up
   * (kdialog)
   * (kdegraphics-thumbnailers)
-- * (kio-fuse)
   * (kde-inotify-survey)
   * (kio-admin)
   * (kio-gdrive)
@@@ -162,13 -185,17 +184,6 @@@ libavcodec cannot be shipped on CDs (c.
   * !libavcodec*
   * (!fonts-guru)
  
--== Oops handling ==
--
--Disable oops handling by default. As of kcrash 5.29 oops are automatically forwarded to handlers, which by default would be apport, which we do not want. coredumpd might be handy, but is not used right now https://phabricator.kde.org/T3891
--
- We will thus mangle the output by sedding out the following: kerneloops-daemon, whoopsie, apport, systemd-coredump.
 -We will thus mangle the output by sedding out the following: kerneloops-daemon, whoopsie, apport.
--This happens in our ./update script!
 -
 -As of 2019-05-13 unstable ships with coredumpd to ensure we can easily track down crashers that are much more likely to happen on git master.
 -
 - * (systemd-coredump)
--
  == Ubuntu Masking ==
  
  Ubuntu has some excessively useless deps deep in the stack. We'll "mask" them
diff --cc update.cfg
index 3810924,fcbef3c..9e3b925
--- a/update.cfg
+++ b/update.cfg
@@@ -5,8 -5,8 +5,8 @@@ dist: jamm
  seeds: desktop-ko desktop live all
  architectures: amd64 armhf arm64
  seed_base: https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/ https://invent.kde.org/
- seed_dist: neon/neon/seeds.Neon/release
+ seed_dist: neon/neon/seeds.Neon/unstable
 -archive_base/default: http://archive.ubuntu.com/ubuntu/,http://archive.neon.kde.org/testing
 +archive_base/default: http://archive.ubuntu.com/ubuntu/,http://archive.neon.kde.org/user
  archive_base/ports: http://ports.ubuntu.com/ubuntu-ports/
  archive_base/armhf: %(archive_base/ports)s
  archive_base/arm64: %(archive_base/ports)s