[neon/kde/oxygen/Neon/stable] debian: liboxygenstyleconfig6 and kde-style-oxygen Breaks old kde-style-oxygen-qt5 for moved files

[Jonathan Esk-Riddell]

Git commit 1bc79d80a5d026f848a7c3e0dc5efb2d8b934f0b by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 15:48.
Pushed by jriddell into branch 'Neon/stable'.

liboxygenstyleconfig6 and kde-style-oxygen Breaks old kde-style-oxygen-qt5 for moved files

M  +12   -10   debian/control
M  +1    -1    debian/kwin-decoration-oxygen.install
M  +2    -2    debian/liboxygenstyle5.install
M  +1    -1    debian/liboxygenstyleconfig5.install
M  +1    -1    debian/oxygen-cursor-theme.install
M  +1    -1    debian/plasma-theme-oxygen.install

https://invent.kde.org/neon/kde/oxygen/-/commit/1bc79d80a5d026f848a7c3e0dc5efb2d8b934f0b

diff --git a/debian/control b/debian/control
index 18e9bd9..85e5f11 100644
--- a/debian/control
+++ b/debian/control
@@ -40,10 +40,10 @@ Build-Depends: cmake,
                pkg-config,
                pkg-kde-tools,
                pkg-kde-tools-neon,
-               qtbase5-dev,
-               qtdeclarative5-dev,
                qt6-base-dev,
                qt6-declarative-dev,
+               qtbase5-dev,
+               qtdeclarative5-dev
 Standards-Version: 4.6.2
 Homepage: https://https://invent.kde.org/plasma/oxygen/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/oxygen
@@ -53,7 +53,7 @@ Package: oxygen
 Architecture: any
 Depends: plasma-theme-oxygen (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Oxygen meta-package
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
@@ -77,13 +77,13 @@ Description: Look-and-feel for the Oxygen desktop theme
 
 Package: kde-style-oxygen
 Architecture: any
-Depends: oxygen (= ${binary:Version}),
-         liboxygenstyle6 (= ${binary:Version}),
+Depends: liboxygenstyle6 (= ${binary:Version}),
          liboxygenstyleconfig6 (= ${binary:Version}),
+         oxygen (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kde-style-oxygen-qt6
-Replaces: kde-style-oxygen-qt6
+Breaks: kde-style-oxygen-qt5 (<< 4:5.91.90), kde-style-oxygen-qt6
+Replaces: kde-style-oxygen-qt5 (<< 4:5.91.90), kde-style-oxygen-qt6
 Description: Qt decoration for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
@@ -113,6 +113,8 @@ Section: libs
 Depends: kde-style-oxygen (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: kde-style-oxygen-qt5 (<< 4:5.91.90)
+Replaces: kde-style-oxygen-qt5 (<< 4:5.91.90)
 Description: style library for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
@@ -133,9 +135,9 @@ Description: style library configuration for the Oxygen desktop theme
 
 Package: kde-style-oxygen-qt5
 Architecture: any
-Depends: oxygen (= ${binary:Version}),
-         liboxygenstyle5-5,
+Depends: liboxygenstyle5-5,
          liboxygenstyleconfig5-5,
+         oxygen (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Qt decoration for the Oxygen desktop theme
@@ -177,4 +179,4 @@ Package: liboxygenstyleconfig5-5
 Architecture: all
 Depends: kde-style-oxygen-qt5, ${misc:Depends}
 Description: Dummy transitional
- Transitional dummy package.
\ No newline at end of file
+ Transitional dummy package.
diff --git a/debian/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index c5a0b77..e31a3ff 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.oxygen.so
 usr/lib/*/qt6/plugins/org.kde.kdecoration2.kcm/kcm_oxygendecoration.so
+usr/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.oxygen.so
 usr/share/applications/kcm_oxygendecoration.desktop
diff --git a/debian/liboxygenstyle5.install b/debian/liboxygenstyle5.install
index fb6ab61..8c86d51 100644
--- a/debian/liboxygenstyle5.install
+++ b/debian/liboxygenstyle5.install
@@ -1,3 +1,3 @@
-usr/lib/*/liboxygenstyle5.so.6.*
+usr/bin/oxygen-demo5
 usr/lib/*/liboxygenstyle5.so.6
-usr/bin/oxygen-demo5 
+usr/lib/*/liboxygenstyle5.so.6.*
diff --git a/debian/liboxygenstyleconfig5.install b/debian/liboxygenstyleconfig5.install
index 1cf2213..1162c15 100644
--- a/debian/liboxygenstyleconfig5.install
+++ b/debian/liboxygenstyleconfig5.install
@@ -1,2 +1,2 @@
+usr/lib/*/liboxygenstyleconfig5.so.6
 usr/lib/*/liboxygenstyleconfig5.so.6.*
-usr/lib/*/liboxygenstyleconfig5.so.6
\ No newline at end of file
diff --git a/debian/oxygen-cursor-theme.install b/debian/oxygen-cursor-theme.install
index f6049a8..6e8b443 100644
--- a/debian/oxygen-cursor-theme.install
+++ b/debian/oxygen-cursor-theme.install
@@ -1,6 +1,6 @@
+usr/share/icons/KDE_Classic/
 usr/share/icons/Oxygen_Black/
 usr/share/icons/Oxygen_Blue/
 usr/share/icons/Oxygen_White/
 usr/share/icons/Oxygen_Yellow/
 usr/share/icons/Oxygen_Zion/
-usr/share/icons/KDE_Classic/
diff --git a/debian/plasma-theme-oxygen.install b/debian/plasma-theme-oxygen.install
index 6d8b139..5ab416f 100644
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1,2 +1,2 @@
+usr/share/metainfo/org.kde.oxygen.appdata.xml
 usr/share/plasma/look-and-feel/org.kde.oxygen/
-usr/share/metainfo/org.kde.oxygen.appdata.xml
\ No newline at end of file