[neon/kde/kwin/Neon/stable] debian: kwin-common breaks old kwin-addons (from kdeplasma-addons) for BUG: 480704

[Jonathan Esk-Riddell]

Git commit 2d57e3d9e08e068f876e25929905b005b7288525 by Jonathan Esk-Riddell.
Committed on 06/02/2024 at 20:27.
Pushed by jriddell into branch 'Neon/stable'.

kwin-common breaks old kwin-addons (from kdeplasma-addons) for BUG: 480704

M  +6    -7    debian/control
M  +3    -3    debian/kwin-common.install

https://invent.kde.org/neon/kde/kwin/-/commit/2d57e3d9e08e068f876e25929905b005b7288525

diff --git a/debian/control b/debian/control
index a301c70..032c949 100644
--- a/debian/control
+++ b/debian/control
@@ -105,21 +105,23 @@ Depends: hwdata,
          kwin-data (= ${source:Version}),
          libplasma6,
          qml6-module-org-kde-kitemmodels,
-         qml6-module-org-kde-quickcharts,
          qml6-module-org-kde-kquickcontrolsaddons,
+         qml6-module-org-kde-quickcharts,
          qml6-module-qtmultimedia,
+         qml6-module-qtquick,
          qml6-module-qtquick-controls,
          qml6-module-qtquick-layouts,
          qml6-module-qtquick-virtualkeyboard,
          qml6-module-qtquick-window,
-         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libmaliit-plugins2,
             maliit-keyboard,
             plasma-desktop,
-            qt6-virtualkeyboard,
             python3,
+            qt6-virtualkeyboard
+Breaks: kwin-addons (<< 4:5.91)
+Replaces: kwin-addons (<< 4:5.91)
 Description: KDE window manager, common files
  KWin (pronounced as one syllable "kwin") is the window
  manager for the KDE Plasma Desktop. It gives you complete
@@ -131,7 +133,6 @@ Description: KDE window manager, common files
  .
  This package is part of the KDE base workspace module.
 
-
 Package: kwin-dev
 Section: libdevel
 Architecture: any
@@ -184,9 +185,7 @@ Description: KDE window manager, wayland version, PREVIEW release
 Package: kwin-x11
 Architecture: any
 X-Neon-MergedPackage: true
-Depends: kwin-common (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: kwin-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Provides: kwin, x-window-manager
 Description: KDE window manager, X11 version
  KWin (pronounced as one syllable "kwin") is the window
diff --git a/debian/kwin-common.install b/debian/kwin-common.install
index 3e749ee..1a812f8 100644
--- a/debian/kwin-common.install
+++ b/debian/kwin-common.install
@@ -4,19 +4,19 @@ usr/lib/*/libkcmkwincommon.so.6
 usr/lib/*/libkcmkwincommon.so.6.*
 usr/lib/*/libkwin.so.6
 usr/lib/*/libkwin.so.6.*
-usr/lib/*/qt6/qml/org/kde/kwin/
 usr/lib/*/qt6/plugins/kf6/packagestructure/
 usr/lib/*/qt6/plugins/kwin/
-usr/lib/*/qt6/plugins/org.kde.kdecoration2/
 usr/lib/*/qt6/plugins/org.kde.kdecoration2.kcm/
+usr/lib/*/qt6/plugins/org.kde.kdecoration2/
 usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/
 usr/lib/*/qt6/plugins/plasma/kcms/systemsettings_qwidgets/
+usr/lib/*/qt6/qml/org/kde/kwin/
 usr/lib/systemd/user/
 usr/share/applications/
 usr/share/config.kcfg/
-usr/share/kconf_update/
 usr/share/doc/*/*/kcontrol/
 usr/share/icons/*/*/apps/kwin.*
+usr/share/kconf_update/
 usr/share/knotifications6/kwin.notifyrc
 usr/share/knsrcfiles/
 usr/share/krunner/dbusplugins/