[neon/neon-packaging/ruqola/Neon/unstable] debian: build with Qt 6

Jonathan Esk-Riddell null at kde.org
Wed Jan 17 10:25:49 GMT 2024


Git commit 2f9a4eb12fdb2d71b9afcc8a13808d90335bb86f by Jonathan Esk-Riddell.
Committed on 17/01/2024 at 11:25.
Pushed by jriddell into branch 'Neon/unstable'.

build with Qt 6

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

https://invent.kde.org/neon/neon-packaging/ruqola/-/commit/2f9a4eb12fdb2d71b9afcc8a13808d90335bb86f

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 adaf074..b2d8133 100644
--- a/debian/control
+++ b/debian/control
@@ -2,38 +2,34 @@ Source: ruqola
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.1.0~),
-               kuserfeedback-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5doctools-dev,
-               libkf5i18n-dev,
-               libkf5idletime-dev,
-               libkf5kio-dev,
-               libkf5networkmanagerqt-dev,
-               libkf5notifications-dev,
-               libkf5notifyconfig-dev,
-               libkf5prison-dev,
-               libkf5purpose-dev,
-               libkf5syntaxhighlighting-dev,
-               libkf5textaddons-dev,
-               libqt5networkauth5-dev,
-               libqt5svg5-dev,
-               libqt5texttospeech5-dev,
-               libqt5websockets5-dev,
-               pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qt5keychain-dev,
-               qtbase5-dev (>= 5.2.0~),
-               qtdeclarative5-dev,
-               qtdeclarative5-dev-tools,
-               qtmultimedia5-dev
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kidletime-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-knotifyconfig-dev,
+               kf6-ktextaddons-dev,
+               kf6-kuserfeedback-dev,
+               kf6-networkmanager-qt-dev,
+               kf6-prison-dev,
+               kf6-purpose-dev,
+               kf6-syntax-highlighting-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-multimedia-dev,
+               qt6-networkauth-dev,
+               qt6-speech-dev,
+               qt6-svg-dev,
+               qt6-websockets-dev,
+               qtkeychain-qt6-dev
 Standards-Version: 3.9.8
 Homepage: http://www.kde.org/
-Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-extras/ruqola.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/ruqola.git
 
 Package: ruqola
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 8fdc178..5ad9f39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 
-export QT_SELECT=qt5
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
-CMAKE_ARGS = -DEXPERIMENTAL_DATABASE_SUPPORT=1
-
-
 %:
-	dh $@ --with pkgkde_symbolshelper
+	dh $@ --with kf6
 
-override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKE_ARGS)
+override_dh_auto_test:
+	 -


More information about the Neon-commits mailing list