[neon/neon-packaging/kopeninghours/Neon/release] debian: port to qt 6

[Jonathan Esk-Riddell]

Git commit 9f2ca81f9e709afae93c7be1245afa21ae8d36bc by Jonathan Esk-Riddell.
Committed on 25/02/2024 at 09:06.
Pushed by jriddell into branch 'Neon/release'.

port to qt 6

M  +10   -33   debian/control
D  +0    -1    debian/files
R  +1    -1    debian/libkopeninghours1-qt6.install [from: debian/libkopeninghours1.install - 075% similarity]
D  +0    -1    debian/qml-module-org-kde-kopeninghours.install
A  +1    -0    debian/qml6-module-org-kde-kopeninghours.install
M  +4    -2    debian/rules

https://invent.kde.org/neon/neon-packaging/kopeninghours/-/commit/9f2ca81f9e709afae93c7be1245afa21ae8d36bc

diff --git a/debian/control b/debian/control
index 64273f8..c68124d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Build-Depends: bison,
                extra-cmake-modules (>= 5.28.0~),
                flex,
                libboost-python1.74-dev,
-               libkf5holidays-dev,
-               libkf5i18n-dev,
-               qtbase5-dev,
-               qtdeclarative5-dev
+               kf6-kholidays-dev,
+               kf6-ki18n-dev,
+	       qt6-base-dev,
+	       qt6-declarative-dev
 Standards-Version: 4.5.0
 
-Package: libkopeninghours1
+Package: libkopeninghours1-qt6
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: OSM opening hours expressions library
@@ -22,7 +22,7 @@ Description: OSM opening hours expressions library
 
 Package: libkopeninghours-dev
 Architecture: any
-Depends: libkopeninghours1 (= ${binary:Version}),
+Depends: libkopeninghours1-qt6 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OSM opening hours expressions library
@@ -30,31 +30,18 @@ Description: OSM opening hours expressions library
  .
  This package contains the development files.
 
-Package: qml-module-org-kde-kopeninghours
+Package: qml6-module-org-kde-kopeninghours
 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}
-Breaks: qml-module-org-kde-kopeninhours (<< 22.04.3-1neon)
-Replaces: qml-module-org-kde-kopeninhours (<< 22.04.3-1neon)
 Description: OSM opening hours expressions library
  A library for parsing and evaluating OSM opening hours expressions.
  .
  This package contains the Qt Quick module.
 
-Package: qml-module-org-kde-kopeninhours
-Architecture: any
-Depends: qml-module-org-kde-kopeninghours,
-         ${shlibs:Depends}
-Section: oldlibs
-Priority: extra
-Description: dummy package renamed
- A library for parsing and evaluating OSM opening hours expressions.
- .
- Transitional package.
-
 Package: python3-kopeninghours
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -64,13 +51,3 @@ Description: OSM opening hours expressions library
  A library for parsing and evaluating OSM opening hours expressions.
  .
  This package contains the Python library.
-
-Package: python-kopeninghours
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, python3-kopeninghours
-Section: oldlibs
-Priority: extra
-Description: dummy package renamed
- A library for parsing and evaluating OSM opening hours expressions.
- .
- Transitional package.
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 635d856..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-kopeninghours_21.04.0-0neon_source.buildinfo libs optional
diff --git a/debian/libkopeninghours1.install b/debian/libkopeninghours1-qt6.install
similarity index 75%
rename from debian/libkopeninghours1.install
rename to debian/libkopeninghours1-qt6.install
index 4776038..50f12b5 100644
--- a/debian/libkopeninghours1.install
+++ b/debian/libkopeninghours1-qt6.install
@@ -1,4 +1,4 @@
 usr/lib/*/libKOpeningHours.so.*.*
 usr/lib/*/libKOpeningHours.so.1
 usr/share/locale/*/LC_MESSAGES/
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/qml-module-org-kde-kopeninghours.install b/debian/qml-module-org-kde-kopeninghours.install
deleted file mode 100644
index d89982b..0000000
--- a/debian/qml-module-org-kde-kopeninghours.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/qt5/qml/
diff --git a/debian/qml6-module-org-kde-kopeninghours.install b/debian/qml6-module-org-kde-kopeninghours.install
new file mode 100644
index 0000000..4faa219
--- /dev/null
+++ b/debian/qml6-module-org-kde-kopeninghours.install
@@ -0,0 +1 @@
+/usr/lib/*/qt6/qml/
diff --git a/debian/rules b/debian/rules
index 02924bb..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/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