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

Carlos De Maine null at kde.org
Tue Nov 21 23:57:59 GMT 2023


Git commit b9d4d0c237f0c18f48e7a4fb9c84e3c675afd384 by Carlos De Maine.
Committed on 22/11/2023 at 00:57.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +22   -24   debian/control
M  +1    -4    debian/meta/cmake-ignore
M  +4    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/falkon/-/commit/b9d4d0c237f0c18f48e7a4fb9c84e3c675afd384

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 14849fb..f70863b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,44 +3,42 @@ Section: web
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Georges Khaznadar <georgesk at debian.org>
-Build-Depends: cmake (>= 3.18),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 5.27.0),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
                libjs-jquery,
                libjs-jquery-ui,
-               libkf5archive-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5i18n-dev,
-               libkf5kio-dev,
-               libkf5notifications-dev,
-               libkf5purpose-dev,
-               libkf5wallet-dev,
-               libqt5x11extras5-dev,
+               kf6-karchive-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kjobwidgets-dev,
+               kf6-knotifications-dev,
+               kf6-kpurpose-dev,
+               kf6-kwallet-dev,
+               libpyside6-dev,
+               libshiboken6-dev,
                libssl-dev,
                libx11-dev,
                libxcb-util0-dev,
                pkg-config,
                pkg-kde-tools,
                qt5-qmake,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtchooser,
-               qtscript5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               qtwebengine5-dev
-Standards-Version: 4.0.0
+               qt6-5compat-dev,
+               qt6-base-dev,
+               qt6-tools-dev,
+               qt6-webengine-dev
+Standards-Version: 4.6.2
 Homepage: https://userbase.kde.org/Falkon
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/falkon
 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/falkon
 
 Package: falkon
 Architecture: any
-Depends: libqt5sql5-sqlite,
-         qml-module-org-kde-kirigami2,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-controls2,
+Depends: qt6-base,
+         qml6-module-org-kde-kirigami2,
+         qml6-module-qtquick-controls,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: qupzilla
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
index 953377f..8b13789 100644
--- a/debian/meta/cmake-ignore
+++ b/debian/meta/cmake-ignore
@@ -1,4 +1 @@
-PySide2
-Shiboken2
-PythonLibs
-Python3
+
diff --git a/debian/rules b/debian/rules
index b57f3e9..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list