[neon/kde/qqc2-breeze-style/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Tue Mar 14 02:09:30 GMT 2023


Git commit e52822186e6bb5f37052ec2c19d4162bd1a203a5 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +10   -12   debian/control
M  +2    -2    debian/libqqc2breezestyle-dev.install
M  +4    -4    debian/qml-module-org-kde-qqc2breezestyle.install
M  +6    -3    debian/rules

https://invent.kde.org/neon/kde/qqc2-breeze-style/commit/e52822186e6bb5f37052ec2c19d4162bd1a203a5

diff --git a/debian/control b/debian/control
index 0931169..59c7579 100644
--- a/debian/control
+++ b/debian/control
@@ -4,21 +4,19 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Scarlett Moore <sgmoore at kde.org>,
            Patrick Franz <deltaone at debian.org>,
-           Norbert Preining <norbert at preining.info>,
+           Norbert Preining <norbert at preining.info>
 Build-Depends: cmake (>= 3.6),
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.76.0~),
-               libkf5guiaddons-dev (>= 5.76.0~),
-               libkf5config-dev (>= 5.76.0~),
-               kirigami2-dev (>= 5.76.0~),
-               libkf5iconthemes-dev (>= 5.76.0~),
-               libkf5configwidgets-dev (>= 5.76.0~),
-               libqt5x11extras5-dev (>= 5.15.0~),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kguiaddons-dev,
+               kf6-kiconthemes-dev,
+               kf6-kirigami2-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev (>= 5.15.0~),
-               qtdeclarative5-dev (>= 5.15.0~),
-               qtquickcontrols2-5-dev (>= 5.15.0~),
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev
 Homepage: https://invent.kde.org/plasma/qqc2-breeze-style
 Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/qqc2-breeze-style.git
diff --git a/debian/libqqc2breezestyle-dev.install b/debian/libqqc2breezestyle-dev.install
index 1e1a786..d3d4bd5 100644
--- a/debian/libqqc2breezestyle-dev.install
+++ b/debian/libqqc2breezestyle-dev.install
@@ -1,2 +1,2 @@
-usr/lib/*/cmake/KF5QQC2BreezeStyle/*
-usr/lib/*/cmake/KF5QQC2BreezeStyle/
+usr/kf6/lib/*/cmake/KF5QQC2BreezeStyle/
+usr/kf6/lib/*/cmake/KF5QQC2BreezeStyle/*
diff --git a/debian/qml-module-org-kde-qqc2breezestyle.install b/debian/qml-module-org-kde-qqc2breezestyle.install
index 9f1beb6..14499ee 100644
--- a/debian/qml-module-org-kde-qqc2breezestyle.install
+++ b/debian/qml-module-org-kde-qqc2breezestyle.install
@@ -1,4 +1,4 @@
-usr/lib/*/qt5/qml/org/kde/kirigami.2/styles/org.kde.breeze/*
-usr/lib/*/qt5/qml/QtQuick/Controls.2/*
-usr/lib/*/qt5/qml/org/kde/breeze/*
-usr/lib/*/qt5/plugins/kf5/kirigami/*
+usr/kf6/lib/*/qt5/qml/QtQuick/Controls.2/*
+usr/kf6/lib/*/qt5/qml/org/kde/breeze/*
+usr/kf6/lib/*/qt5/qml/org/kde/kirigami.2/styles/org.kde.breeze/*
+usr/kf6/lib/*/qt6/plugins/kf6/kirigami/*
diff --git a/debian/rules b/debian/rules
index 5bafb42..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+	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