[neon/neon-packaging/mauikit-terminal/Neon/unstable] debian: kf6ify

[Carlos De Maine]

Git commit 06113df2441aeaf3d7b1a99adc0f86ad5b63c77e by Carlos De Maine.
Committed on 04/12/2023 at 04:52.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +26   -12   debian/control
M  +1    -1    debian/libmauikitterminal-dev.install
D  +0    -3    debian/libmauikitterminal3.install
D  +0    -1    debian/libmauikitterminal3.lintian-overrides
A  +3    -0    debian/libmauikitterminal4.install
A  +1    -0    debian/libmauikitterminal4.lintian-overrides
D  +0    -1    debian/qml-module-org-mauikit-terminal.install
A  +1    -0    debian/qml6-module-org-mauikit-terminal.install
M  +7    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/mauikit-terminal/-/commit/06113df2441aeaf3d7b1a99adc0f86ad5b63c77e

diff --git a/debian/control b/debian/control
index 6db9489..15a657b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,21 +4,21 @@ Priority: optional
 Maintainer: Jonathan Riddell <jr at jriddell.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5i18n-dev,
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-i18n-dev,
                mauiman-dev,
                mauikit-dev,
-               qtbase5-dev,
-               qtdeclarative5-dev
+               qt6-base-dev,
+               qt6-declarative-dev
 Standards-Version: 4.6.2
 Homepage: https://mauikit.org/
 
-Package: qml-module-org-mauikit-terminal
+Package: qml6-module-org-mauikit-terminal
 Architecture: any
 Depends: libmauikit,
-         libmauikitterminal3,
+         libmauikitterminal4,
          qml-module-org-kde-kirigami2,
          qml-module-org-kde-kquickimageeditor,
          qml-module-org-maui-mauikit,
@@ -28,25 +28,39 @@ Depends: libmauikit,
          qml-module-qtquick-shapes,
          ${misc:Depends},
          ${shlibs:Depends}
+Provides: qml-module-org-mauikit-terminal
+Replaces: qml-module-org-mauikit-terminal
 Description: Terminal support components for Maui applications
  .
  This package contains the mauikit terminal component support qml module.
 
-Package: libmauikitterminal3
+Package: libmauikitterminal4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libmauikitterminal, libmauikitterminal1, libmauikitterminal2
-Replaces: libmauikitterminal, libmauikitterminal1, libmauikitterminal2
+Provides: libmauikitterminal3
+Replaces: libmauikitterminal3
 Description: Terminal support components for Maui applications
  .
  This package contains the mauikit terminal component support library.
 
 Package: libmauikitterminal-dev
 Architecture: any
-Depends: libmauikitterminal3 (= ${binary:Version}),
+Depends: libmauikitterminal4 (= ${binary:Version}),
          qml-module-org-mauikit-terminal,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Terminal support components for Maui applications
  .
  This package contains mauikit terminal component support development files.
+
+Package: qml-module-org-mauikit-terminal
+Architecture: all
+Depends: qml6-module-org-mauikit-terminal, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libmauikitterminal3
+Architecture: all
+Depends: libmauikitterminal4, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libmauikitterminal-dev.install b/debian/libmauikitterminal-dev.install
index 4625847..61c672a 100644
--- a/debian/libmauikitterminal-dev.install
+++ b/debian/libmauikitterminal-dev.install
@@ -1,3 +1,3 @@
 usr/include/
 usr/lib/*/cmake/
-usr/lib/*/libMauiKitTerminal3.so
+usr/lib/*/libMauiKitTerminal4.so
diff --git a/debian/libmauikitterminal3.install b/debian/libmauikitterminal3.install
deleted file mode 100644
index e5fd58d..0000000
--- a/debian/libmauikitterminal3.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libMauiKitTerminal3.so.3
-usr/lib/*/libMauiKitTerminal3.so.3*
-usr/share/locale/*/LC_MESSAGES/mauikitterminal.mo
\ No newline at end of file
diff --git a/debian/libmauikitterminal3.lintian-overrides b/debian/libmauikitterminal3.lintian-overrides
deleted file mode 100644
index 9a30805..0000000
--- a/debian/libmauikitterminal3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmauikitterminal3: package-name-doesnt-match-sonames libMauiKitTerminal3-3
diff --git a/debian/libmauikitterminal4.install b/debian/libmauikitterminal4.install
new file mode 100644
index 0000000..77df912
--- /dev/null
+++ b/debian/libmauikitterminal4.install
@@ -0,0 +1,3 @@
+usr/lib/*/libMauiKitTerminal3.so.4
+usr/lib/*/libMauiKitTerminal3.so.4*
+usr/share/locale/*/LC_MESSAGES/mauikitterminal.mo
\ No newline at end of file
diff --git a/debian/libmauikitterminal4.lintian-overrides b/debian/libmauikitterminal4.lintian-overrides
new file mode 100644
index 0000000..7ac37e6
--- /dev/null
+++ b/debian/libmauikitterminal4.lintian-overrides
@@ -0,0 +1 @@
+libmauikitterminal4: package-name-doesnt-match-sonames libMauiKitTerminal4-4
diff --git a/debian/qml-module-org-mauikit-terminal.install b/debian/qml-module-org-mauikit-terminal.install
deleted file mode 100644
index b501d0a..0000000
--- a/debian/qml-module-org-mauikit-terminal.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5
diff --git a/debian/qml6-module-org-mauikit-terminal.install b/debian/qml6-module-org-mauikit-terminal.install
new file mode 100644
index 0000000..c3b090f
--- /dev/null
+++ b/debian/qml6-module-org-mauikit-terminal.install
@@ -0,0 +1 @@
+usr/lib/*/qt6
diff --git a/debian/rules b/debian/rules
index 2d33f6a..5b7382b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,10 @@
 #!/usr/bin/make -f
 
+export QT_SELECT=qt6
+
 %:
-	dh $@
+	dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	-DBUILD_WITH_QT6=ON
\ No newline at end of file