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

[Carlos De Maine]

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

kf6ify

M  +28   -14   debian/control
M  +1    -1    debian/libmauikitaccounts-dev.install
D  +0    -3    debian/libmauikitaccounts3.install
D  +0    -1    debian/libmauikitaccounts3.lintian-overrides
A  +3    -0    debian/libmauikitaccounts4.install
A  +1    -0    debian/libmauikitaccounts4.lintian-overrides
R  +0    -0    debian/qml6-module-org-mauikit-accounts.install [from: debian/qml-module-org-mauikit-accounts.install - 100% similarity]
M  +7    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/mauikit-accounts/-/commit/f98fe41489259ee9a7e88857e23481e9980ea7d6

diff --git a/debian/control b/debian/control
index d9484e6..a757c34 100644
--- a/debian/control
+++ b/debian/control
@@ -5,36 +5,38 @@ Maintainer: Jonathan Riddell <jr at jriddell.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
                extra-cmake-modules,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5i18n-dev,
-               libkf5kio-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kio-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-accounts
+Package: qml6-module-org-mauikit-accounts
 Architecture: any
 Depends: libmauikit,
-         libmauikitaccounts3,
+         libmauikitaccounts4,
          qml-module-org-kde-kirigami2,
          qml-module-org-maui-mauikit,
          qml-module-qtquick-controls2,
          qml-module-qtquick-shapes,
          ${misc:Depends},
          ${shlibs:Depends}
+Provides: qml-module-org-mauikit-accounts
+Replaces: qml-module-org-mauikit-accounts
 Description: MauiKit Utilities to Handle User Accounts
  MauiKit utilities to handle User Accounts
  .
  This package contains the mauikit accounts qml module.
 
-Package: libmauikitaccounts3
+Package: libmauikitaccounts4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libmauikitaccounts, libmauikit1accounts, libmauikitaccounts2
-Replaces: libmauikitaccounts, libmauikit1accounts, libmauikitaccounts2
+Provides: libmauikitaccounts3
+Replaces: libmauikitaccounts3
 Description: MauiKit Utilities to Handle User Accounts
  MauiKit utilities to handle User Accounts
  .
@@ -42,12 +44,24 @@ Description: MauiKit Utilities to Handle User Accounts
 
 Package: libmauikitaccounts-dev
 Architecture: any
-Depends: libmauikitaccounts3 (= ${binary:Version}),
-         qml-module-org-mauikit-accounts,
-         qtbase5-dev,
+Depends: libmauikitaccounts4 (= ${binary:Version}),
+         qml6-module-org-mauikit-accounts,
+         qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: MauiKit Utilities to Handle User Accounts
  MauiKit utilities to handle User Accounts
  .
  This package contains mauikit accounts development files.
+
+Package: libmauikitaccounts3
+Architecture: all
+Depends: libmauikitaccounts4, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml-module-org-mauikit-accounts
+Architecture: all
+Depends: qml6-module-org-mauikit-accounts, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
\ No newline at end of file
diff --git a/debian/libmauikitaccounts-dev.install b/debian/libmauikitaccounts-dev.install
index 69a6bc0..eddf994 100644
--- a/debian/libmauikitaccounts-dev.install
+++ b/debian/libmauikitaccounts-dev.install
@@ -1,3 +1,3 @@
 usr/include/
 usr/lib/*/cmake/
-usr/lib/*/libMauiKitAccounts3.so
+usr/lib/*/libMauiKitAccounts4.so
diff --git a/debian/libmauikitaccounts3.install b/debian/libmauikitaccounts3.install
deleted file mode 100644
index 1f060a7..0000000
--- a/debian/libmauikitaccounts3.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libMauiKitAccounts3.so.3
-usr/lib/*/libMauiKitAccounts3.so.3*
-usr/share/locale/*/LC_MESSAGES/mauikitaccounts.mo
\ No newline at end of file
diff --git a/debian/libmauikitaccounts3.lintian-overrides b/debian/libmauikitaccounts3.lintian-overrides
deleted file mode 100644
index 36dbc18..0000000
--- a/debian/libmauikitaccounts3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmauikitaccounts3: package-name-doesnt-match-sonames libMauiKitAccounts3-3
\ No newline at end of file
diff --git a/debian/libmauikitaccounts4.install b/debian/libmauikitaccounts4.install
new file mode 100644
index 0000000..831a419
--- /dev/null
+++ b/debian/libmauikitaccounts4.install
@@ -0,0 +1,3 @@
+usr/lib/*/libMauiKitAccounts4.so.4
+usr/lib/*/libMauiKitAccounts4.so.4*
+usr/share/locale/*/LC_MESSAGES/mauikitaccounts.mo
\ No newline at end of file
diff --git a/debian/libmauikitaccounts4.lintian-overrides b/debian/libmauikitaccounts4.lintian-overrides
new file mode 100644
index 0000000..82b275d
--- /dev/null
+++ b/debian/libmauikitaccounts4.lintian-overrides
@@ -0,0 +1 @@
+libmauikitaccounts4: package-name-doesnt-match-sonames libMauiKitAccounts4-4
\ No newline at end of file
diff --git a/debian/qml-module-org-mauikit-accounts.install b/debian/qml6-module-org-mauikit-accounts.install
similarity index 100%
rename from debian/qml-module-org-mauikit-accounts.install
rename to debian/qml6-module-org-mauikit-accounts.install
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