[neon/kde/oxygen/Neon/unstable] debian: fix installs and define qt6 packages

Carlos De Maine null at kde.org
Mon Jul 10 01:57:58 BST 2023


Git commit 8b668870ed62950df067be3503a32ee64dbbcc58 by Carlos De Maine.
Committed on 10/07/2023 at 00:57.
Pushed by carlosdem into branch 'Neon/unstable'.

fix installs and define qt6 packages

M  +6    -8    debian/control
R  +2    -2    debian/kde-style-oxygen-qt6.install [from: debian/kde-style-oxygen-qt5.install - 075% similarity]
R  +0    -0    debian/liboxygenstyle6.install [from: debian/liboxygenstyle5-5.install - 100% similarity]
R  +0    -1    debian/liboxygenstyleconfig6.install [from: debian/liboxygenstyleconfig5-5.install - 079% similarity]
M  +0    -3    debian/rules

https://invent.kde.org/neon/kde/oxygen/-/commit/8b668870ed62950df067be3503a32ee64dbbcc58

diff --git a/debian/control b/debian/control
index 7697398..9b57db5 100644
--- a/debian/control
+++ b/debian/control
@@ -27,16 +27,14 @@ Build-Depends: cmake,
                pkg-kde-tools-neon,
                qt6-base-dev,
                qt6-declarative-dev
-Standards-Version: 4.5.0
-Homepage: https://projects.kde.org/projects/kde/workspace/oxygen
+Standards-Version: 4.6.2
+Homepage: https://https://invent.kde.org/plasma/oxygen/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/oxygen
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/oxygen.git
 
-Package: kde-style-oxygen-qt5
+Package: kde-style-oxygen-qt6
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: plasma-desktop-data (<< 4:5.17.0~)
-Replaces: plasma-desktop-data (<< 4:5.17.0~)
 Description: Qt decoration for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
@@ -50,7 +48,7 @@ Description: KWin decoration for the Oxygen desktop theme
  .
  This package contains the KWin decoration and settings modules.
 
-Package: liboxygenstyle5-5
+Package: liboxygenstyle6
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -60,7 +58,7 @@ Description: style library for the Oxygen desktop theme
  This package contains the private library used by the widget theme
  and KWin style.
 
-Package: liboxygenstyleconfig5-5
+Package: liboxygenstyleconfig6
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -72,7 +70,7 @@ Description: style library configuration for the Oxygen desktop theme
 
 Package: plasma-theme-oxygen
 Architecture: any
-Depends: kde-style-oxygen-qt5 (= ${binary:Version}),
+Depends: kde-style-oxygen-qt6 (= ${binary:Version}),
          kwin-decoration-oxygen (= ${binary:Version}),
          oxygen-sounds,
          qml6-module-qtquick,
diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt6.install
similarity index 75%
rename from debian/kde-style-oxygen-qt5.install
rename to debian/kde-style-oxygen-qt6.install
index b227e0f..8facbf0 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt6.install
@@ -1,5 +1,5 @@
-usr/bin/oxygen-settings5
-usr/lib/*/qt6/plugins/kstyle_oxygen_config.so
+usr/bin/oxygen-settings6
+usr/lib/*/qt6/plugins/kstyle_config/
 usr/lib/*/qt6/plugins/styles/oxygen.so
 usr/share/color-schemes/Oxygen.colors
 usr/share/color-schemes/OxygenCold.colors
diff --git a/debian/liboxygenstyle5-5.install b/debian/liboxygenstyle6.install
similarity index 100%
rename from debian/liboxygenstyle5-5.install
rename to debian/liboxygenstyle6.install
diff --git a/debian/liboxygenstyleconfig5-5.install b/debian/liboxygenstyleconfig6.install
similarity index 79%
rename from debian/liboxygenstyleconfig5-5.install
rename to debian/liboxygenstyleconfig6.install
index f699d63..110adcf 100644
--- a/debian/liboxygenstyleconfig5-5.install
+++ b/debian/liboxygenstyleconfig6.install
@@ -1,5 +1,4 @@
 usr/lib/*/liboxygenstyleconfig5.so.5
 usr/lib/*/liboxygenstyleconfig5.so.5.*
-usr/share/kservices6/oxygenstyleconfig.desktop
 usr/share/locale/*/LC_MESSAGES/liboxygenstyleconfig.mo
 usr/share/locale/*/LC_MESSAGES/oxygen_style_config.mo
diff --git a/debian/rules b/debian/rules
index 47c772a..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,3 @@
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
-
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list