[neon/kde/plasma-desktop/Neon/stable] debian: breaks old neon-settings-2 for moved kde-mimetype.list

[Jonathan Esk-Riddell]

Git commit 0d2385af4a03664d4ff5738c4a6ac5367e51abfe by Jonathan Esk-Riddell.
Committed on 20/02/2024 at 11:25.
Pushed by jriddell into branch 'Neon/stable'.

breaks old neon-settings-2 for moved kde-mimetype.list

M  +5    -7    debian/control
M  +1    -1    debian/plasma-desktop-dev.install
M  +1    -1    debian/plasma-desktop.install

https://invent.kde.org/neon/kde/plasma-desktop/-/commit/0d2385af4a03664d4ff5738c4a6ac5367e51abfe

diff --git a/debian/control b/debian/control
index 9b1fcdd..e142a3d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: breeze-dev,
                kf6-extra-cmake-modules,
                kf6-kauth-dev,
                kf6-kcmutils-dev,
-               kf6-kconfig-dev,
                kf6-kcolorscheme-dev,
+               kf6-kconfig-dev,
                kf6-kcoreaddons-dev,
                kf6-kdbusaddons-dev,
                kf6-kdeclarative-dev,
@@ -24,8 +24,8 @@ Build-Depends: breeze-dev,
                kf6-kguiaddons-dev,
                kf6-ki18n-dev,
                kf6-kio-dev,
-               kf6-kirigami2-dev,
                kf6-kirigami-addons-dev,
+               kf6-kirigami2-dev,
                kf6-kitemmodels-dev,
                kf6-knewstuff-dev,
                kf6-knotifications-dev,
@@ -146,12 +146,12 @@ Recommends: bluedevil,
             plasma-pa,
             powerdevil,
             systemsettings
-Provides: kde-config-touchpad,
-          plasma-desktop-data,
-          user-manager
+Provides: kde-config-touchpad, plasma-desktop-data, user-manager
 Replaces: kde-config-touchpad,
+          neon-settings-2 (<< 0.5),
           plasma-desktop-data,
           user-manager
+Breaks: neon-settings-2 (<< 0.5)
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
@@ -182,8 +182,6 @@ Description: Tools and widgets for the desktop
  .
  This package is part of the KDE Plasma.
 
-#### transitionals below
-
 Package: kde-config-touchpad
 Depends: plasma-desktop, ${misc:Depends}
 Architecture: all
diff --git a/debian/plasma-desktop-dev.install b/debian/plasma-desktop-dev.install
index 457aa50..95f8de5 100644
--- a/debian/plasma-desktop-dev.install
+++ b/debian/plasma-desktop-dev.install
@@ -1 +1 @@
-usr/share/dbus-1/interfaces/
\ No newline at end of file
+usr/share/dbus-1/interfaces/
diff --git a/debian/plasma-desktop.install b/debian/plasma-desktop.install
index 0785478..8c59a46 100644
--- a/debian/plasma-desktop.install
+++ b/debian/plasma-desktop.install
@@ -5,8 +5,8 @@ usr/lib/*/qt6/
 usr/share/accounts/
 usr/share/applications/
 usr/share/config.kcfg/
-usr/share/dbus-1/system.d/
 usr/share/dbus-1/system-services/
+usr/share/dbus-1/system.d/
 usr/share/doc/
 usr/share/icons/
 usr/share/k*