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

[Carlos De Maine]

Git commit 2bff056fe892f4d7ee7117677aad2cebabfd4738 by Carlos De Maine.
Committed on 04/12/2023 at 04:44.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +37   -23   debian/control
M  +2    -2    debian/libmauikittexteditor-dev.install
D  +0    -3    debian/libmauikittexteditor3.install
M  +1    -1    debian/libmauikittexteditor3.lintian-overrides
A  +3    -0    debian/libmauikittexteditor4.install
D  +0    -1    debian/qml-module-org-mauikit-texteditor.install
D  +0    -1    debian/qml-module-org-mauikit-texteditor.lintian-overrides
A  +1    -0    debian/qml6--module-org-mauikit-texteditor.install
A  +1    -0    debian/qml6-module-org-mauikit-texteditor.lintian-overrides
M  +7    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/mauikit-texteditor/-/commit/2bff056fe892f4d7ee7117677aad2cebabfd4738

diff --git a/debian/control b/debian/control
index ee8fbb5..4162ec4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,49 +4,63 @@ Priority: optional
 Maintainer: Jonathan Riddell <jr at jriddell.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules,
-               libkf5coreaddons-dev,
-               libkf5i18n-dev,
-               libkf5syntaxhighlighting-dev,
+               kf6-extra-cmake-modules,
+               kf6-coreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-syntaxhighlighting-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-texteditor
+Package: qml6-module-org-mauikit-texteditor
 Architecture: any
 Depends: libmauikit,
-         libmauikittexteditor3,
-         qml-module-org-kde-kirigami2,
-         qml-module-org-kde-kquickimageeditor,
-         qml-module-org-kde-sonnet,
-         qml-module-org-maui-mauikit,
-         qml-module-qt-labs-qmlmodels,
-         qml-module-qt-labs-settings,
-         qml-module-qtquick-controls2,
-         qml-module-qtquick-shapes,
+         libmauikittexteditor4,
+         qml6-module-org-kde-kirigami2,
+         qml6-module-org-kde-kquickimageeditor,
+         qml6-module-org-kde-sonnet,
+         qml6-module-org-maui-mauikit,
+         qml6-module-qt-labs-qmlmodels,
+         qml6-module-qt-labs-settings,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick-shapes,
          ${misc:Depends},
          ${shlibs:Depends}
+Provides: qml-module-org-mauikit-texteditor
+Replaces: qml-module-org-mauikit-texteditor
 Description: MauiKit Text Editor components
  This package contains the mauikit text editor component qml module.
 
-Package: libmauikittexteditor3
+Package: libmauikittexteditor4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libmauikittexteditor, libmauikittexteditor1, libmauikittexteditor2
-Replaces: libmauikittexteditor, libmauikittexteditor1, libmauikittexteditor2
+Provides: libmauikittexteditor3
+Replaces: libMauiKitTextEditor3
 Description: MauiKit Text Editor components
  This package contains the mauikit text editor component library.
 
 Package: libmauikittexteditor-dev
 Architecture: any
-Depends: libmauikittexteditor3 (= ${binary:Version}),
-         qml-module-org-mauikit-texteditor,
-         qtbase5-dev,
-         qtdeclarative5-dev,
+Depends: libmauikittexteditor4 (= ${binary:Version}),
+         qml6-module-org-mauikit-texteditor,
+         qt6-base-dev,
+         qt6-declarative-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: MauiKit Text Editor components
  This package contains mauikit text editor component development files.
+
+Package: qml-module-org-mauikit-texteditor
+Architecture: all
+Depends: qml6-module-org-mauikit-texteditor, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libmauikittexteditor3
+Architecture: all
+Depends: libmauikittexteditor3, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libmauikittexteditor-dev.install b/debian/libmauikittexteditor-dev.install
index 562a37d..daa4820 100644
--- a/debian/libmauikittexteditor-dev.install
+++ b/debian/libmauikittexteditor-dev.install
@@ -1,3 +1,3 @@
 usr/include/
-usr/lib/*/cmake/MauiKitTextEditor3/
-usr/lib/*/libMauiKitTextEditor3.so
\ No newline at end of file
+usr/lib/*/cmake/MauiKitTextEditor4/
+usr/lib/*/libMauiKitTextEditor4.so
\ No newline at end of file
diff --git a/debian/libmauikittexteditor3.install b/debian/libmauikittexteditor3.install
deleted file mode 100644
index 06cfd5e..0000000
--- a/debian/libmauikittexteditor3.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libMauiKitTextEditor3.so.3
-usr/lib/*/libMauiKitTextEditor3.so.3.*
-usr/share/locale/
diff --git a/debian/libmauikittexteditor3.lintian-overrides b/debian/libmauikittexteditor3.lintian-overrides
index c6190e4..453f51e 100644
--- a/debian/libmauikittexteditor3.lintian-overrides
+++ b/debian/libmauikittexteditor3.lintian-overrides
@@ -1 +1 @@
-libmauikittexteditor3: package-name-doesnt-match-sonames libMauiKitTextEditor3-3
\ No newline at end of file
+libmauikittexteditor4: package-name-doesnt-match-sonames libMauiKitTextEditor4-4
\ No newline at end of file
diff --git a/debian/libmauikittexteditor4.install b/debian/libmauikittexteditor4.install
new file mode 100644
index 0000000..33566c8
--- /dev/null
+++ b/debian/libmauikittexteditor4.install
@@ -0,0 +1,3 @@
+usr/lib/*/libMauiKitTextEditor4.so.4
+usr/lib/*/libMauiKitTextEditor4.so.4.*
+usr/share/locale/
diff --git a/debian/qml-module-org-mauikit-texteditor.install b/debian/qml-module-org-mauikit-texteditor.install
deleted file mode 100644
index 865e7ea..0000000
--- a/debian/qml-module-org-mauikit-texteditor.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/qt5
diff --git a/debian/qml-module-org-mauikit-texteditor.lintian-overrides b/debian/qml-module-org-mauikit-texteditor.lintian-overrides
deleted file mode 100644
index 9d21449..0000000
--- a/debian/qml-module-org-mauikit-texteditor.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-qml-module-org-mauikit-texteditor: package-has-unnecessary-activation-of-ldconfig-trigger
\ No newline at end of file
diff --git a/debian/qml6--module-org-mauikit-texteditor.install b/debian/qml6--module-org-mauikit-texteditor.install
new file mode 100644
index 0000000..45bcd3f
--- /dev/null
+++ b/debian/qml6--module-org-mauikit-texteditor.install
@@ -0,0 +1 @@
+/usr/lib/*/qt6
diff --git a/debian/qml6-module-org-mauikit-texteditor.lintian-overrides b/debian/qml6-module-org-mauikit-texteditor.lintian-overrides
new file mode 100644
index 0000000..19ff8b7
--- /dev/null
+++ b/debian/qml6-module-org-mauikit-texteditor.lintian-overrides
@@ -0,0 +1 @@
+qml6-module-org-mauikit-texteditor: package-has-unnecessary-activation-of-ldconfig-trigger
\ No newline at end of file
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