[neon/kde/oxygen/Neon/unstable] debian: fix installs an build order

[Carlos De Maine]

Git commit b9819a2afcd76701f4e44c7165d4c2897d3aeb48 by Carlos De Maine.
Committed on 30/08/2023 at 02:19.
Pushed by carlosdem into branch 'Neon/unstable'.

fix installs an build order

M  +9    -0    debian/control
M  +2    -2    debian/kde-style-oxygen-qt5.install
M  +1    -1    debian/kde-style-oxygen.install
M  +1    -1    debian/liboxygenstyle5-5.install
M  +1    -0    debian/liboxygenstyle6.install
M  +1    -2    debian/liboxygenstyleconfig6.install
D  +0    -11   debian/oxygen-cursor-theme.dirs
M  +3    -4    debian/rules

https://invent.kde.org/neon/kde/oxygen/-/commit/b9819a2afcd76701f4e44c7165d4c2897d3aeb48

diff --git a/debian/control b/debian/control
index 2abc0d1..c9e92f0 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,7 @@ Architecture: any
 Depends: kde-style-oxygen (= ${binary:Version}),
          kde-style-oxygen-qt5 (= ${binary:Version}),
          kwin-decoration-oxygen (= ${binary:Version}),
+         oxygen-cursor-theme,
          oxygen-sounds,
          qml-module-qtquick2,
          qml6-module-qtquick,
@@ -96,6 +97,14 @@ Description: KWin decoration for the Oxygen desktop theme
  .
  This package contains the KWin decoration and settings modules.
 
+Package: oxygen-cursor-theme
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Default Plasma cursor theme.
+ These are the Oxygen cursor themes for the KDE Plasma 6 desktop.
+ .
+ This package is part of the Oxygen theme module.
+
 Package: liboxygenstyle6
 Architecture: any
 Section: libs
diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt5.install
index 5ccb723..e12e961 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt5/plugins/kstyle_config/kstyle_oxygen_config.so
-usr/lib/*/qt5/plugins/styles/oxygen.so
+#usr/lib/*/qt5/plugins/kstyle_config/kstyle_oxygen_config.so
+#usr/lib/*/qt5/plugins/styles/oxygen.so
diff --git a/debian/kde-style-oxygen.install b/debian/kde-style-oxygen.install
index 8facbf0..7198397 100644
--- a/debian/kde-style-oxygen.install
+++ b/debian/kde-style-oxygen.install
@@ -1,6 +1,6 @@
 usr/bin/oxygen-settings6
 usr/lib/*/qt6/plugins/kstyle_config/
-usr/lib/*/qt6/plugins/styles/oxygen.so
+usr/lib/*/qt6/plugins/styles/oxygen6.so
 usr/share/color-schemes/Oxygen.colors
 usr/share/color-schemes/OxygenCold.colors
 usr/share/icons/hicolor/256x256/apps/oxygen-settings.png
diff --git a/debian/liboxygenstyle5-5.install b/debian/liboxygenstyle5-5.install
index fe53f3b..2ad64f9 100644
--- a/debian/liboxygenstyle5-5.install
+++ b/debian/liboxygenstyle5-5.install
@@ -1 +1 @@
-usr/lib/*/liboxygenstyle5.so.5
+#usr/lib/*/liboxygenstyle5.so.5
diff --git a/debian/liboxygenstyle6.install b/debian/liboxygenstyle6.install
index 0b77b51..2f3284a 100644
--- a/debian/liboxygenstyle6.install
+++ b/debian/liboxygenstyle6.install
@@ -1,2 +1,3 @@
+usr/bin/oxygen-demo6
 usr/lib/*/liboxygenstyle6.so.5
 usr/lib/*/liboxygenstyle6.so.5.*
diff --git a/debian/liboxygenstyleconfig6.install b/debian/liboxygenstyleconfig6.install
index c5e0e1f..2f6cd22 100644
--- a/debian/liboxygenstyleconfig6.install
+++ b/debian/liboxygenstyleconfig6.install
@@ -1,4 +1,3 @@
 usr/lib/*/liboxygenstyleconfig6.so.5
 usr/lib/*/liboxygenstyleconfig6.so.5.*
-usr/share/locale/*/LC_MESSAGES/liboxygenstyleconfig.mo
-usr/share/locale/*/LC_MESSAGES/oxygen_style_config.mo
+usr/share/locale/*/LC_MESSAGES/
diff --git a/debian/oxygen-cursor-theme.dirs b/debian/oxygen-cursor-theme.dirs
deleted file mode 100644
index 27161f6..0000000
--- a/debian/oxygen-cursor-theme.dirs
+++ /dev/null
@@ -1,11 +0,0 @@
-/usr/share/icons/default
-
-usr/bin/oxygen-demo5
-usr/share/icons/Oxygen_Zion/
-usr/share/icons/KDE_Classic/
-usr/share/icons/Oxygen_Black/
-usr/share/icons/Oxygen_Black/
-usr/share/icons/Oxygen_Yellow/
-usr/share/icons/Oxygen_Blue/
-usr/share/icons/Oxygen_White/
-usr/share/locale/*/LC_MESSAGES/oxygen_style_demo.mo
diff --git a/debian/rules b/debian/rules
index c164fe8..b69b271 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,14 +12,13 @@ execute_after_dh_auto_clean:
 	rm -rf build-QT5
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
 	dh_auto_configure --builddirectory=build-QT5 -- $(QT5_CMAKE_ARGS) -DUSE_QT_VERSION=5
-
+	dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
 
 override_dh_auto_build:
-	dh_auto_build
 	dh_auto_build --builddirectory=build-QT5
+	dh_auto_build
 
 override_dh_install:
-	dh_install
 	dh_auto_install --builddirectory=build-QT5
+	dh_install