[neon/kde/kidentitymanagement/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit ebe58a7b476cdc1f1b05c408a0029da02887c467 by Carlos De Maine.
Committed on 24/09/2023 at 08:05.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +5    -4    debian/control
M  +2    -2    debian/kpim6-kidentitymanagement-dev.install
M  +7    -7    debian/kpim6-kidentitymanagement.install
M  +2    -3    debian/rules

https://invent.kde.org/neon/kde/kidentitymanagement/-/commit/ebe58a7b476cdc1f1b05c408a0029da02887c467

diff --git a/debian/control b/debian/control
index 8d0ae69..98db059 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,9 @@ Build-Depends: cmake (>= 3.0~),
                kf6-kio-dev,
                kf6-kirigami-addons-dev,
                kf6-ktextaddons-dev,
-               kpim6-kpimtextedit-dev,
                kf6-ktextwidgets-dev,
                kf6-kxmlgui-dev,
+               kpim6-kpimtextedit-dev,
                pkg-kde-tools-neon,
                qt6-base-dev,
                qt6-declarative-dev,
@@ -52,10 +52,11 @@ Architecture: any
 Multi-Arch: same
 X-Neon-MergedPackage: true
 Depends: qml-module-org-kde-kirigami2,
-         qml-module-qtquick-controls2,
-         qml-module-qt-labs-platform,
          qml-module-org-kde-kirigamiaddons,
-         ${misc:Depends}, ${shlibs:Depends}
+         qml-module-qt-labs-platform,
+         qml-module-qtquick-controls2,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: library for managing user identities
  This library provides an API for managing user identities.
  .
diff --git a/debian/kpim6-kidentitymanagement-dev.install b/debian/kpim6-kidentitymanagement-dev.install
index 8ed8ab2..e6f95fe 100644
--- a/debian/kpim6-kidentitymanagement-dev.install
+++ b/debian/kpim6-kidentitymanagement-dev.install
@@ -1,10 +1,10 @@
 usr/include/KPim6/KIdentityManagementCore/
+usr/include/KPim6/KIdentityManagementQuick/KIdentityManagementQuick/
 usr/include/KPim6/KIdentityManagementWidgets/
 usr/lib/*/cmake/
 usr/lib/*/libKPim6IdentityManagementCore.so
+usr/lib/*/libKPim6IdentityManagementQuick.so
 usr/lib/*/libKPim6IdentityManagementWidgets.so
 usr/lib/*/qt6/mkspecs/modules/qt_KIdentityManagementCore.pri
 usr/lib/*/qt6/mkspecs/modules/qt_KIdentityManagementQuick.pri
 usr/lib/*/qt6/mkspecs/modules/qt_KIdentityManagementWidgets.pri
-usr/include/KPim6/KIdentityManagementQuick/KIdentityManagementQuick/
-usr/lib/*/libKPim6IdentityManagementQuick.so
diff --git a/debian/kpim6-kidentitymanagement.install b/debian/kpim6-kidentitymanagement.install
index e9c3cf6..67dcc04 100644
--- a/debian/kpim6-kidentitymanagement.install
+++ b/debian/kpim6-kidentitymanagement.install
@@ -1,11 +1,11 @@
-usr/lib/*/libKPim6IdentityManagementCore.so.6
 usr/lib/*/libKPim6IdentityManagementCore.so.*.*
+usr/lib/*/libKPim6IdentityManagementCore.so.6
+usr/lib/*/libKPim6IdentityManagementQuick.so.*.*
+usr/lib/*/libKPim6IdentityManagementQuick.so.6
+usr/lib/*/libKPim6IdentityManagementWidgets.so.*.*
+usr/lib/*/libKPim6IdentityManagementWidgets.so.6
+usr/lib/*/qt6/qml/org/kde/kidentitymanagement/
+usr/share/dbus-1/interfaces/kf6_org.kde.pim.IdentityManager.xml
 usr/share/locale/
 usr/share/qlogging-categories6/kidentitymanagement.categories
 usr/share/qlogging-categories6/kidentitymanagement.renamecategories
-usr/lib/*/libKPim6IdentityManagementWidgets.so.6
-usr/lib/*/libKPim6IdentityManagementWidgets.so.*.*
-usr/share/dbus-1/interfaces/kf6_org.kde.pim.IdentityManager.xml
-usr/lib/*/libKPim6IdentityManagementQuick.so.6
-usr/lib/*/libKPim6IdentityManagementQuick.so.*.*
-usr/lib/*/qt6/qml/org/kde/kidentitymanagement/
diff --git a/debian/rules b/debian/rules
index b742750..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
-
-override_dh_auto_test:
-	- xvfb-run -- dh_auto_test --no-parallel