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

[Carlos De Maine]

Git commit 72a7419e054feaa9056ca36dc82a8309d0e1310f by Carlos De Maine.
Committed on 04/01/2024 at 16:05.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +12   -13   debian/control
M  +1    -1    debian/libkosmindoormap1.install
D  +0    -1    debian/qml-module-org-kde-kosmindoormap.install
A  +1    -0    debian/qml6-module-org-kde-kosmindoormap.install
M  +7    -2    debian/rules

https://invent.kde.org/neon/neon-packaging/kosmindoormap/-/commit/72a7419e054feaa9056ca36dc82a8309d0e1310f

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 645acbb..1fdbfd3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,29 +3,28 @@ Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: bison,
-               cmake (>= 2.8.12),
-               debhelper (>= 12),
-               extra-cmake-modules (>= 5.28.0~),
+               cmake,
+               debhelper-compat (= 13),
                flex,
-               libkf5i18n-dev,
+               kf6-extra-cmake-modules (>= 5.28.0~),
+               kf6-ki18n-dev,
                libkpublictransport-dev,
                libkopeninghours-dev,
                libprotobuf-dev,
                osmctools,
-               pkg-kde-tools,
+               pkg-kde-tools-neon,
                protobuf-compiler,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtdeclarative5-dev,
+               qt6-base-dev,
+               qt6-declarative5-dev,
                zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
 
 Package: kosmindoormap-dev
 Section: libdevel
 Architecture: any
 Depends: libkosm1 (= ${binary:Version}),
          libkosmindoormap1 (= ${binary:Version}),
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends}
 Description: OSM multi-floor indoor map renderer
  Open Stree Map indoor map renderer
@@ -46,9 +45,9 @@ Description: OSM multi-floor indoor map renderer
 
 Package: qml-module-org-kde-kosmindoormap
 Architecture: any
-Depends: qml-module-qtquick-controls2,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
+Depends: qml6-module-qtquick-controls,
+         qml6-module-qtquick-layouts,
+         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OSM multi-floor indoor map renderer QML module
diff --git a/debian/libkosmindoormap1.install b/debian/libkosmindoormap1.install
index 3d87476..2b910be 100644
--- a/debian/libkosmindoormap1.install
+++ b/debian/libkosmindoormap1.install
@@ -1,4 +1,4 @@
 usr/lib/*/libKOSMIndoorMap.so.1
 usr/lib/*/libKOSMIndoorMap.so.2*
 usr/share/locale/*/LC_MESSAGES/*
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/qml-module-org-kde-kosmindoormap.install b/debian/qml-module-org-kde-kosmindoormap.install
deleted file mode 100644
index d89982b..0000000
--- a/debian/qml-module-org-kde-kosmindoormap.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/qt5/qml/
diff --git a/debian/qml6-module-org-kde-kosmindoormap.install b/debian/qml6-module-org-kde-kosmindoormap.install
new file mode 100644
index 0000000..4faa219
--- /dev/null
+++ b/debian/qml6-module-org-kde-kosmindoormap.install
@@ -0,0 +1 @@
+/usr/lib/*/qt6/qml/
diff --git a/debian/rules b/debian/rules
index 02924bb..12f4a0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+# 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
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DBUILD_QCH=ON