[neon/mobile/calindori/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Sun Apr 14 22:24:16 BST 2024


Git commit b4e2a6452e8361a5cc85c581d4aee543e067c623 by Carlos De Maine.
Committed on 14/04/2024 at 21:24.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -3    debian/.gitlab-ci.yml
D  +0    -1    debian/compat
M  +18   -19   debian/control
M  +3    -1    debian/rules

https://invent.kde.org/neon/mobile/calindori/-/commit/b4e2a6452e8361a5cc85c581d4aee543e067c623

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
deleted file mode 100644
index bb8b523..0000000
--- a/debian/.gitlab-ci.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-include: 'https://gitlab.com/debian-pm/tools/build/raw/master/docker/gitlab-ci-base.yml'
-
-image: jbbgameich/build
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 9e3fd4a..986a5f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,32 +3,31 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 XSBC-Original-Maintainer: Linus Jahn <lnj at kaidan.im>
-Build-Depends: cmake (>= 3.0.0),
-               debhelper (>= 11),
-               extra-cmake-modules,
-               kirigami2-dev,
-               libkf5calendarcore-dev,
-               libkf5config-dev,
-               libkf5dbusaddons-dev,
-               libkf5i18n-dev,
-               libkf5notifications-dev,
-               libkf5people-dev (>= 5.78.0~),
-               libqt5svg5-dev,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kirigami2-dev,
+               kf6-kcalendarcore-dev,
+               kf6-kconfig-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-knotifications-dev,
+               kf6-kpeople-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.9),
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtquickcontrols2-5-dev,
-               qttools5-dev
-Standards-Version: 4.2.1
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-svg-dev,
+               qt6-tools-dev
+Standards-Version: 4.6.2
 Homepage: https://invent.kde.org/kde/calindori
 Vcs-Browser: https://gitlab.com/debian-pm/apps/calindori
 Vcs-Git: https://gitlab.com/debian-pm/apps/calindori.git
 
 Package: calindori
 Architecture: any
-Depends: qml-module-org-kde-kirigami2,
-         qml-module-qtquick-controls2,
+Depends: qml6-module-org-kde-kirigami2,
+         qml6-module-qtquick-controls,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Calendar application for Plasma Mobile
diff --git a/debian/rules b/debian/rules
index 2d33f6a..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list