[neon/kde/plasma-desktop/Neon/release] debian: merge stable into release for kde_megarelease_6

[Carlos De Maine]

Git commit 26c31258b10ec4c2308bb60e1cefad03f8948cd3 by Carlos De Maine.
Committed on 22/02/2024 at 04:45.
Pushed by carlosdem into branch 'Neon/release'.

merge stable into release for kde_megarelease_6

M  +13   -1    debian/changelog
M  +121  -174  debian/control

https://invent.kde.org/neon/kde/plasma-desktop/-/commit/26c31258b10ec4c2308bb60e1cefad03f8948cd3

diff --cc debian/changelog
index cbcac0c,04e754d..bf9fb98
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1199,4 -1211,4 +1211,4 @@@ plasma-desktop (4:4.97.0-0ubuntu1) utop
    * Initial release.
    * add plasma-nm networking depend
  
-- -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 10 Jun 2014 10:24:08 +0100
++ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 10 Jun 2014 10:24:08 +0100
diff --cc debian/control
index d8e2072,e142a3d..a2edada
--- a/debian/control
+++ b/debian/control
@@@ -245,10 -182,20 +182,20 @@@ Description: Tools and widgets for the 
   .
   This package is part of the KDE Plasma.
  
- Package: user-manager
- Section: oldlibs
- Priority: extra
+ Package: kde-config-touchpad
+ Depends: plasma-desktop, ${misc:Depends}
+ Architecture: all
+ Description: transitional dummy package
+  This is a transitional dummy package. It can safely be removed.
+ 
+ Package: plasma-desktop-data
  Architecture: all
- Depends: plasma-desktop
+ Depends: plasma-desktop, ${misc:Depends}
  Description: dummy transitional package
   This is a transitional package which can be removed.
+ 
+ Package: user-manager
+ Architecture: all
+ Depends: plasma-desktop, ${misc:Depends}
+ Description: dummy transitional package
 - This is a transitional package which can be removed.
++ This is a transitional package which can be removed.