[neon/neon-packaging/angelfish/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Tue Sep 26 16:28:45 BST 2023


Git commit 036d8211234d3cf320c38cee1b5a495216bea9ec by Carlos De Maine.
Committed on 26/09/2023 at 17:28.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +24   -26   debian/control
M  +3    -10   debian/rules

https://invent.kde.org/neon/neon-packaging/angelfish/-/commit/036d8211234d3cf320c38cee1b5a495216bea9ec

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index cd28922..f5ac05f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,38 +3,36 @@ Maintainer: Jonah BrĂ¼chert <jbb at kaidan.im>
 Section: net
 Priority: optional
 Build-Depends: cmake,
-               debhelper (>= 12),
-               extra-cmake-modules,
-               kirigami2-dev,
-               g++-10,
-               gcc-10,
-               kirigami-addons-dev,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kirigami2-dev,
+               kf6-kirigami-addons-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-knotifications-dev,
+               kf6-purpose-dev,
+               kf6-qqc2-desktop-style-dev,
+               kf6-kwindowsystem-dev,
                libfuturesql-dev,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5dbusaddons-dev,
-               libkf5i18n-dev,
-               libkf5notifications-dev,
-               libkf5purpose-dev,
-               libkf5qqc2desktopstyle-dev,
-               libkf5windowsystem-dev,
-               libqt5svg5-dev,
-               qcoro-qt5-dev,
-               qtbase5-dev,
-               qtfeedback5-dev,
-               qtquickcontrols2-5-dev,
-               qtwebengine5-dev
-Standards-Version: 4.5.0
+               qcoro-qt6-dev,
+               qt6-base-dev,
+               qt6-declaratve-dev,
+               qt6-feedback-dev,
+               qt6-svg-dev,
+               qt6-webengine-dev
+Standards-Version: 4.6.2
 Vcs-Browser: https://gitlab.com/debian-pm/apps/plasma-angelfish
 Vcs-Git: https://gitlab.com/debian-pm/apps/plasma-angelfish.git
 
 Package: angelfish
 Architecture: any
-Depends: qml-module-org-kde-kirigami2,
-         qml-module-org-kde-purpose,
-         qml-module-qt-labs-settings,
-         qml-module-qtquick-controls2,
-         qml-module-qtwebengine,
+Depends: qml6-module-org-kde-kirigami2,
+         qml6-module-org-kde-purpose,
+         qml6-module-qt-labs-settings,
+         qml6-module-qtquick-controls,
+         qml6-module-qtwebengine,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Small webbrowser for mobile devices
diff --git a/debian/rules b/debian/rules
index 49a4a17..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
-
-export CC=gcc-10
-export CXX=g++-10
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_TESTING=ON
-
-override_dh_auto_test:
-	HOME=/tmp dh_auto_test
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list