[neon/kde/breeze/Neon/unstable] debian: new fancy double build
Carlos De Maine
null at kde.org
Mon Aug 28 11:01:04 BST 2023
Git commit b5cb4671c1d390e3358f9b23af75928ca774aefe by Carlos De Maine.
Committed on 28/08/2023 at 12:00.
Pushed by carlosdem into branch 'Neon/unstable'.
new fancy double build
A +1 -0 debian/breeze5.install
M +61 -17 debian/control
M +11 -3 debian/rules
https://invent.kde.org/neon/kde/breeze/-/commit/b5cb4671c1d390e3358f9b23af75928ca774aefe
diff --git a/debian/breeze5.install b/debian/breeze5.install
new file mode 100644
index 0000000..3c113b0
--- /dev/null
+++ b/debian/breeze5.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/plugins/styles/breeze5.so
diff --git a/debian/control b/debian/control
index 9c579b2..df0876b 100644
--- a/debian/control
+++ b/debian/control
@@ -21,14 +21,31 @@ Build-Depends: cmake,
kf6-kwayland-dev,
kf6-kwindowsystem-dev,
kf6-plasma-framework-dev,
+ kirigami2-dev,
libfftw3-dev,
- libkdecorations2-dev,
libx11-dev,
+ libkdecorations2-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5coreaddons-dev,
+ libkf5guiaddons-dev,
+ libkf5i18n-dev,
+ libkf5iconthemes-dev,
+ libkf5kcmutils-dev,
+ libkf5package-dev,
+ libkf5plasma-dev,
+ libkf5service-dev,
+ libkf5style-dev,
+ libkf5wayland-dev,
+ libkf5windowsystem-dev,
+ libqt5x11extras5-dev,
pkg-config,
pkg-kde-tools-neon,
qt6-base-dev,
- qt6-declarative-dev
-Standards-Version: 4.1.4
+ qt6-declarative-dev,
+ qtbase5-dev,
+ qtdeclarative5-dev,
+Standards-Version: 4.6.2
Homepage: https://projects.kde.org/projects/kde/workspace/breeze
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/breeze
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/breeze.git
@@ -41,18 +58,11 @@ Depends: breeze-cursor-theme (= ${source:Version}),
kwin-style-breeze (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Suggests: orion-gtk-theme
-Breaks: kde-style-breeze (<< 4:5.2.2+git20150325),
- plasma-desktop (<< 4:5.14),
- plasma-integration (<< 5.14),
- plasma-look-and-feel-org-kde-breezedark-desktop (<< 4:5.15.0)
-Replaces: kde-style-breeze (<< 4:5.2.2+git20150325),
- plasma-look-and-feel-org-kde-breezedark-desktop (<< 4:5.15.0)
Description: Default Plasma theme (meta-package).
This is the default theme for the KDE Plasma desktop.
.
This package includes wallpapers, icons, cursors, KWin style and Qt
- widget style for the Plasma 5 desktop.
+ widget style for the Plasma 6 desktop.
.
This package is part of the KDE base workspace module.
@@ -60,7 +70,7 @@ Package: breeze-cursor-theme
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Default Plasma cursor theme.
- This is the default cursor theme for the KDE Plasma 5 desktop.
+ This is the default cursor theme for the KDE Plasma 6 desktop.
.
This package is part of the Breeze theme module.
@@ -71,14 +81,10 @@ Description: Default Plasma theme (development files).
This is the default theme for the KDE Plasma desktop.
.
This package includes development files.
- .
- This package is part of the KDE base workspace module.
Package: kde-style-breeze
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libbreezecommon5-5 (<< 4:5.15.0)
-Replaces: libbreezecommon5-5 (<< 4:5.15.0)
Description: Widget style for Qt and KDE Software
This is the default widget style for KDE's Plasma desktop.
.
@@ -88,6 +94,44 @@ Package: kwin-style-breeze
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: KWin Breeze Style
- This is the Breeze window manager style for the KDE Plasma 5 desktop.
+ This is the Breeze window manager style for the KDE Plasma 6 desktop.
.
This package is part of the Breeze theme module.
+
+Package: breeze5
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Description: Default Plasma theme for Plasma 5.
+ This is the compatability theme for QT/KDE 5 apps on the Plasma 6 desktop.
+
+Package: breeze5-dev
+Architecture: any
+Depends: breeze5, breeze-dev, ${misc:Depends}, ${shlibs:Depends}
+Description: Default Plasma theme (development files).
+ Transitional dummy package.
+
+Package: breeze5-cursor-theme
+Architecture: all
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
+Description: Default Plasma cursor theme.
+ Transitional dummy package.
+
+
+Package: kde-style-breeze5
+Architecture: any
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
+Description: Widget style for Qt and KDE Software
+ Transitional dummy package.
+
+Package: kwin-style-breeze5
+Architecture: any
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
+Description: KWin Breeze Style
+ Transitional dummy package.
+
+Package: kde-style-breeze5-qt4
+Architecture: any
+Depends: breeze5, ${misc:Depends}, ${shlibs:Depends}
+Description: Widget style for Qt 4 and KDE Software - transitional
+ Transitional dummy package.
diff --git a/debian/rules b/debian/rules
index 107ceca..c94c1d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,22 @@
# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON
+QT5_CMAKE_ARGS = -DPHONON_BUILD_QT5=ON -DPHONON_BUILD_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:
# This is required to make sure Plasma does not
@@ -16,6 +26,4 @@ override_dh_install:
CURDIR=$(CURDIR) $(CURDIR)/debian/wrapperthemes.sh breeze_cursors \
Breeze_Light
dh_install
-
-override_dh_shlibdeps:
- dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+ dh_auto_install --builddirectory=build-QT5
More information about the Neon-commits
mailing list