[neon/kde/gwenview/Neon/unstable] debian: port to qt6

Jonathan Esk-Riddell null at kde.org
Tue Jan 9 17:42:24 GMT 2024


Git commit dc206757198991ab79da2c712d8ed3471522e53a by Jonathan Esk-Riddell.
Committed on 09/01/2024 at 18:42.
Pushed by jriddell into branch 'Neon/unstable'.

port to qt6

D  +0    -1    debian/compat
M  +23   -31   debian/control
M  +5    -12   debian/rules

https://invent.kde.org/neon/kde/gwenview/-/commit/dc206757198991ab79da2c712d8ed3471522e53a

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 53dd535..3b07b1e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,45 +1,37 @@
 Source: gwenview
-Section: kde
+1;115;0cSection: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
-Build-Depends: baloo-kf5-dev (>= 5.13) [linux-any],
-               cmake (>= 2.8.12),
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 1.7.0~),
-               kinit-dev,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-baloo-dev (>= 5.13) [linux-any],
+               kf6-extra-cmake-modules,
+               kf6-kactivities-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kitemmodels-dev,
+               kf6-knotifications-dev,
+               kf6-kparts-dev,
+               kf6-kwindowsystem-dev,
+               kf6-purpose-dev,
                libcfitsio-dev,
                libexiv2-dev,
                libjpeg-dev,
-               libkf5activities-dev (>= 5.25~),
-               libkf5doctools-dev (>= 5.25~),
-               libkf5i18n-dev (>= 5.25~),
-               libkf5iconthemes-dev (>= 5.25~),
-               libkf5itemmodels-dev (>= 5.25~),
-               libkf5kdcraw-dev,
-               libkf5kio-dev (>= 5.25~),
-               libkf5kipi-dev,
-               libkf5notifications-dev (>= 5.25~),
-               libkf5parts-dev (>= 5.25~),
-               libkf5purpose-dev,
-               libkf5windowsystem-dev (>= 5.25~),
-               libkimageannotator-dev,
+               libkdcrawqt6-dev,
+               libkf6kdcraw-dev,
                liblcms2-dev,
-               libphonon4qt5-dev (>= 4.6.60),
-               libphonon4qt5experimental-dev (>= 4.9.1),
                libpng-dev,
-               libqt5opengl5-dev (>= 5.6.0~),
-               libqt5svg5-dev (>= 5.6.0~),
-               libqt5x11extras5-dev (>= 5.6.0~),
-               libqt5waylandclient5-dev,
                libtiff-dev,
                libwayland-dev,
                pkg-config,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.6.0~),
-               qtbase5-private-dev,
-               qtscript5-dev (>= 5.4),
-               qtwayland5-dev-tools,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-phonon-dev,
+               qt6-svg-dev,
+               qt6-wayland-dev,
                wayland-protocols
 Standards-Version: 4.1.4
 Homepage: http://www.kde.org/
@@ -49,7 +41,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/gwenview.git
 Package: gwenview
 Section: graphics
 Architecture: any
-Depends: kinit, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: kamera, kio-extras, qt5-image-formats-plugins
 Breaks: ${kde-l10n:all}
 Replaces: ${kde-l10n:all}
diff --git a/debian/rules b/debian/rules
index 2e52df5..b4284e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:16.04.3-5~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
-
-override_dh_auto_configure:
-	$(overridden_command) -- -DGWENVIEW_SEMANTICINFO_BACKEND_NONE=Baloo
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='gwenview-dbg (<= 4:15.12.1-1~~)'
+	true


More information about the Neon-commits mailing list