[neon/neon-packaging/koko/Neon/experimental] debian: kf6ify

[Carlos De Maine]

Git commit 31d1ef588fee5b308d5e16224e90713e71303d7e by Carlos De Maine.
Committed on 07/08/2023 at 05:02.
Pushed by carlosdem into branch 'Neon/experimental'.

kf6ify

D  +0    -1    debian/compat
M  +21   -21   debian/control
M  +4    -26   debian/rules

https://invent.kde.org/neon/neon-packaging/koko/-/commit/31d1ef588fee5b308d5e16224e90713e71303d7e

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 b371c50..19bc6fb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,36 +3,36 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 XSBC-Original-Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Build-Depends: baloo-kf5-dev,
-               cmake (>= 2.6.2),
-               debhelper (>= 9),
-               extra-cmake-modules,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-baloo-dev,
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kdeclarative-dev,
+               kf6-kfilemetadata-dev,
+               kf6-ki18n-dev,
+               kf6-knotifications-dev,
+               kf6-kplasma-dev,
                kquickimageeditor-dev,
                libexiv2-dev (>= 0.21),
-               libkf5config-dev,
-               libkf5declarative-dev,
-               libkf5filemetadata-dev,
-               libkf5i18n-dev,
-               libkf5notifications-dev,
-               libkf5plasma-dev,
-               libqt5svg5-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtpositioning5-dev,
-               wget
-Standards-Version: 3.9.5
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-positioning-dev,
+               libqt6-svg-dev,
+               wget,
+Standards-Version: 4.6.2
 XS-Testsuite: autopkgtest
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/kdeconnect-plasma.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kdeconnect-plasma.git
 
 Package: koko
 Architecture: any
-Depends: plasma-framework,
-         qml-module-org-kde-kquickimageeditor,
-         qml-module-org-kde-purpose,
-         qml-module-qtgraphicaleffects,
+Depends: kf6-plasma-framework,
+         qml6-module-org-kde-kquickimageeditor,
+         qml6-module-org-kde-purpose,
+         qml6-module-qtgraphicaleffects,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE Image Gallery
diff --git a/debian/rules b/debian/rules
index fbbc478..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +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
-
-GEONAME_DATA_FILES := cities1000.zip admin1CodesASCII.txt admin2Codes.txt
-GEONAME_DUMPS := $(addprefix debian/geonames/, $(GEONAME_DATA_FILES))
-GEONAME_SRCS := $(addprefix src/, $(GEONAME_DATA_FILES))
-
-debian/geonames/%:
-	mkdir -p debian/geonames/
-	cd debian/geonames/ && wget -q http://download.geonames.org/export/dump/$*
-
-geonames_deploy: $(GEONAME_DUMPS)
-	cp -v $(GEONAME_DUMPS) src/
-
-geonames_undeploy: $(GEONAME_DUMPS)
-	rm -rf $(GEONAME_SRCS)
-
-override_dh_clean: geonames_undeploy
-	$(overridden_command)
-
-override_dh_auto_configure: geonames_deploy
-	$(overridden_command)
-
-override_dh_strip:
-	$(overridden_command) --dbg-package=koko-dbg
-
-.PHONY: geonames_deploy geonames_undeploy override_dh_clean override_dh_auto_configure override_dh_auto_test
+%:
+	dh $@ --with kf6 --buildsystem kf6