[neon/extras/itinerary/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Sun Sep 24 11:51:05 BST 2023


Git commit 70c39ed1f9d938c9e9ab046560bac8353348ac5a by Carlos De Maine.
Committed on 24/09/2023 at 08:04.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +17   -18   debian/control
M  +3    -22   debian/rules

https://invent.kde.org/neon/extras/itinerary/-/commit/70c39ed1f9d938c9e9ab046560bac8353348ac5a

diff --git a/debian/control b/debian/control
index 6cbcf0b..cb42618 100644
--- a/debian/control
+++ b/debian/control
@@ -4,31 +4,30 @@ Priority: optional
 Maintainer: Scarlett Moore <sgclark at kde.org>
 Build-Depends: cmake,
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.38.0~),
+               kf6-extra-cmake-modules,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kfilemetadata-dev,
+               kf6-kholidays-dev,
+               kf6-ki18n-dev,
+               kf6-knotifications-dev,
+               kf6-kunitconversion-dev,
+               kf6-networkmanager-qt-dev,
+               kf6-prison-dev,
+               kf6-qqc2-desktop-style-dev,
                kirigami-addons-dev,
                kosmindoormap-dev,
-               libkf5calendarcore-dev,
-               libkf5contacts-dev,
-               libkf5crash-dev,
-               libkf5dbusaddons-dev,
-               libkf5filemetadata-dev,
-               libkf5holidays-dev,
-               libkf5i18n-dev,
-               libkf5networkmanagerqt-dev,
-               libkf5notifications-dev,
-               libkf5prison-dev,
-               libkf5qqc2desktopstyle-dev,
-               libkf5unitconversion-dev,
+               kpim6-calendar-dev,
+               kpim6-contacts-dev,
                libkhealthcertificate-dev,
                libkpimitinerary-dev,
                libkpimpkpass-dev,
                libkpublictransport-dev,
                libquotient-dev,
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtlocation5-dev,
-               qtpositioning5-dev,
-               qtquickcontrols2-5-dev,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-location-dev,
+               qt6-positioning-dev,
                shared-mime-info,
                zlib1g-dev
 Standards-Version: 4.1.4
diff --git a/debian/rules b/debian/rules
index 09cf854..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,6 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-export QT_SELECT := qt5
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@
-
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list