[neon/kde/oxygen/Neon/unstable] debian: fancy double build
Carlos De Maine
null at kde.org
Wed Aug 30 00:06:45 BST 2023
Git commit 316cd8bb64d7be20f346d4fd7f837e0f7bbfacf0 by Carlos De Maine.
Committed on 30/08/2023 at 01:04.
Pushed by carlosdem into branch 'Neon/unstable'.
fancy double build
M +80 -16 debian/control
D +0 -7 debian/kde-style-oxygen-qt6.install
D +0 -4 debian/kwin-decoration-oxygen6.install
D +0 -1 debian/liboxygenstyle6.lintian-overrides
D +0 -1 debian/liboxygenstyleconfig6.lintian-overrides
M +1 -9 debian/not-installed
M +19 -0 debian/rules
https://invent.kde.org/neon/kde/oxygen/-/commit/316cd8bb64d7be20f346d4fd7f837e0f7bbfacf0
diff --git a/debian/control b/debian/control
index 421eade..eaf91a3 100644
--- a/debian/control
+++ b/debian/control
@@ -21,32 +21,78 @@ Build-Depends: cmake,
kf6-kwidgetsaddons-dev,
kf6-kwindowsystem-dev,
libkdecorations2-dev,
+ libkf5completion-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5guiaddons-dev,
+ libkf5i18n-dev,
+ libkf5kcmutils-dev,
+ libkf5service-dev,
+ libkf5style-dev,
+ libkf5wayland-dev,
+ libkf5widgetsaddons-dev,
+ libkf5windowsystem-dev,
+ libqt5x11extras5-dev,
libx11-dev,
libxcb1-dev,
pkg-config,
+ pkg-kde-tools,
pkg-kde-tools-neon,
+ qtbase5-dev,
+ qtdeclarative5-dev,
qt6-base-dev,
- qt6-declarative-dev
+ qt6-declarative-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
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/oxygen.git
-Package: kde-style-oxygen-qt6
+Package: oxygen
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kde-style-oxygen
-Replaces: kde-style-oxygen
+Depends: plasma-theme-oxygen (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+
+Description: Oxygen meta-package
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This package contains the meta settings for the Oxygen theme.
+
+Package: plasma-theme-oxygen
+Architecture: any
+Depends: kde-style-oxygen (= ${binary:Version}),
+ kde-style-oxygen-qt5 (= ${binary:Version}),
+ kwin-decoration-oxygen (= ${binary:Version}),
+ oxygen-sounds,
+ qml-module-qtquick2,
+ qml6-module-qtquick,
+
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Look-and-feel for the Oxygen desktop theme
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This package contains the meta settings for the Oxygen theme.
+
+Package: kde-style-oxygen
+Architecture: any
+Depends: liboxygenstyle6,
+ liboxygenstyleconfig6,
+ (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: kde-style-oxygen-qt6
+Replaces: kde-style-oxygen-qt6
Description: Qt decoration for the Oxygen desktop theme
The Oxygen desktop theme is used by Plasma and other KDE Software.
.
This package contains the Qt 6 widget theme.
-Package: kwin-decoration-oxygen6
+Package: kwin-decoration-oxygen
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kwin-decoration-oxygen
-Replaces: kwin-decoration-oxygen
+Breaks: kwin-decoration-oxygen6
+Replaces: kwin-decoration-oxygen6
Description: KWin decoration for the Oxygen desktop theme
The Oxygen desktop theme is used by Plasma and other KDE Software.
.
@@ -72,15 +118,33 @@ Description: style library configuration for the Oxygen desktop theme
This package contains the private library used to configure the widget theme
and KWin style.
-Package: plasma-theme-oxygen
+Package: kde-style-oxygen-qt5
Architecture: any
-Depends: kde-style-oxygen-qt6 (= ${binary:Version}),
- kwin-decoration-oxygen6 (= ${binary:Version}),
- oxygen-sounds,
- qml6-module-qtquick,
+Depends: liboxygenstyle5-5,
+ liboxygenstyleconfig5-5,
+ (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}
-Description: Look-and-feel for the Oxygen desktop theme
+ ${shlibs:Depends}Description: Qt decoration for the Oxygen desktop theme
The Oxygen desktop theme is used by Plasma and other KDE Software.
.
- This package contains the meta settings for the Oxygen theme.
+ This package contains the Qt 5 widget theme.
+
+Package: liboxygenstyle5-5
+Architecture: any
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: style library for the Oxygen desktop theme
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This package contains the private library used by the widget theme
+ and KWin style.
+
+Package: liboxygenstyleconfig5-5
+Architecture: any
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: style library configuration for the Oxygen desktop theme
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This package contains the private library used to configure the widget theme
+ and KWin style.
diff --git a/debian/kde-style-oxygen-qt6.install b/debian/kde-style-oxygen-qt6.install
deleted file mode 100644
index 8facbf0..0000000
--- a/debian/kde-style-oxygen-qt6.install
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-usr/share/icons/hicolor/256x256/apps/oxygen-settings.png
-usr/share/kstyle/themes/oxygen.themerc
diff --git a/debian/kwin-decoration-oxygen6.install b/debian/kwin-decoration-oxygen6.install
deleted file mode 100644
index 2025b9a..0000000
--- a/debian/kwin-decoration-oxygen6.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.oxygen.so
-usr/lib/*/qt6/plugins/org.kde.kdecoration2.kcm/kcm_oxygendecoration.so
-usr/share/applications/kcm_oxygendecoration.desktop
-usr/share/locale/*/LC_MESSAGES/oxygen_kdecoration.mo
diff --git a/debian/liboxygenstyle6.lintian-overrides b/debian/liboxygenstyle6.lintian-overrides
deleted file mode 100644
index d6fcdbf..0000000
--- a/debian/liboxygenstyle6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-liboxygenstyle6: package-name-doesnt-match-sonames liboxygenstyle5-5
diff --git a/debian/liboxygenstyleconfig6.lintian-overrides b/debian/liboxygenstyleconfig6.lintian-overrides
deleted file mode 100644
index 74a4180..0000000
--- a/debian/liboxygenstyleconfig6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-liboxygenstyleconfig6: package-name-doesnt-match-sonames liboxygenstyleconfig5-5
diff --git a/debian/not-installed b/debian/not-installed
index 2a4c624..9dd20b6 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,9 +1 @@
-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
+/usr/share/icons/default
diff --git a/debian/rules b/debian/rules
index 3d69b0d..c164fe8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,24 @@
# SPDX-License-Identifier: LGPL-2.0-or-later
# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
+QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON
+QT5_CMAKE_ARGS = -DBUILD_QT5=ON -DBUILD_QT6=OFF
+
%:
dh $@ --with kf6 --buildsystem kf6
+
+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
+
+
+override_dh_auto_build:
+ dh_auto_build
+ dh_auto_build --builddirectory=build-QT5
+
+override_dh_install:
+ dh_install
+ dh_auto_install --builddirectory=build-QT5
More information about the Neon-commits
mailing list