[neon/kde/kaccounts-integration/Neon/unstable] debian: import kf6 verions

Carlos De Maine null at kde.org
Wed Dec 6 03:17:03 GMT 2023


Git commit e16dabcd2bbafc3e8c4aa095507da0e6ce2ffe97 by Carlos De Maine.
Committed on 06/12/2023 at 04:16.
Pushed by carlosdem into branch 'Neon/unstable'.

import kf6 verions

M  +2    -519  debian/changelog
D  +0    -1    debian/compat
M  +41   -51   debian/control
D  +0    -6    debian/kaccounts-integration.install
A  +5    -0    debian/kaccounts6-integration.install
D  +0    -20   debian/libkaccounts-dev.acc.in
R  +0    -0    debian/libkaccounts6-2.install [from: debian/libkaccounts2.install - 100% similarity]
A  +1    -0    debian/libkaccounts6-2.lintian-overrides
R  +0    -0    debian/libkaccounts6-dev.install [from: debian/libkaccounts-dev.install - 100% similarity]
D  +0    -2    debian/qml-module-org-kde-kaccounts.install
A  +4    -0    debian/qml6-module-org-kde-kaccounts.install
M  +6    -9    debian/rules

https://invent.kde.org/neon/kde/kaccounts-integration/-/commit/e16dabcd2bbafc3e8c4aa095507da0e6ce2ffe97

diff --git a/debian/changelog b/debian/changelog
index f530db7..0b8083e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,522 +1,5 @@
-kaccounts-integration (4:23.08.3-0neon) jammy; urgency=medium
+kaccounts6-integration (4:23.04.2-0neon) jammy; urgency=medium
 
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 09 Nov 2023 12:52:06 +0000
-
-kaccounts-integration (4:23.08.2-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 11 Oct 2023 17:15:13 +0000
-
-kaccounts-integration (4:23.08.1-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 14 Sep 2023 00:58:24 +0000
-
-kaccounts-integration (4:23.08.0-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 24 Aug 2023 09:44:46 +0000
-
-kaccounts-integration (4:23.04.3-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 05 Jul 2023 11:32:39 +0000
-
-kaccounts-integration (4:23.04.2-0neon) jammy; urgency=medium
-
-  * New release
+  * Initial package
 
  -- Neon CI <neon at kde.org>  Tue, 06 Jun 2023 22:12:39 +0000
-
-kaccounts-integration (4:23.04.1-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 10 May 2023 18:37:29 +0000
-
-kaccounts-integration (4:23.04.1-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 19 Apr 2023 15:46:21 +0000
-
-kaccounts-integration (4:22.12.3-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 02 Mar 2023 13:00:20 +0000
-
-kaccounts-integration (4:22.12.2-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 01 Feb 2023 17:29:27 +0000
-
-kaccounts-integration (4:22.12.1-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 05 Jan 2023 16:07:28 +0000
-
-kaccounts-integration (4:22.12.0-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 07 Dec 2022 12:14:02 +0000
-
-kaccounts-integration (4:22.08.3-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 03 Nov 2022 09:35:25 +0000
-
-kaccounts-integration (4:22.08.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 14 Oct 2022 18:06:48 +0000
-
-kaccounts-integration (4:22.08.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 09 Sep 2022 12:25:40 +0000
-
-kaccounts-integration (4:22.08.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 18 Aug 2022 09:38:58 +0000
-
-kaccounts-integration (4:22.04.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 07 Jul 2022 12:24:57 +0000
-
-kaccounts-integration (4:22.04.2-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 07 Jun 2022 20:49:25 +0000
-
-kaccounts-integration (4:22.04.1-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 10 May 2022 13:42:07 +0000
-
-kaccounts-integration (4:22.04.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 18 Apr 2022 12:56:27 +0000
-
-kaccounts-integration (4:21.12.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 03 Mar 2022 11:01:35 +0000
-
-kaccounts-integration (4:21.12.2-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 03 Feb 2022 10:55:43 +0000
-
-kaccounts-integration (4:21.12.2-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 07 Jan 2022 11:01:22 +0000
-
-kaccounts-integration (4:21.12.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 06 Oct 2021 11:38:54 +0000
-
-kaccounts-integration (4:21.08.1-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 01 Sep 2021 09:31:14 +0000
-
-kaccounts-integration (4:21.08.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 11 Aug 2021 10:41:59 +0000
-
-kaccounts-integration (4:21.04.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 12 Jul 2021 11:48:40 +0000
-
-kaccounts-integration (4:21.04.2-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 11 Jun 2021.12.01:14 +0000
-
-kaccounts-integration (4:21.04.1-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 13 May 2021 08:51:41 +0000
-
-kaccounts-integration (4:21.04.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 19 Apr 2021 10:19:44 +0000
-
-kaccounts-integration (4:20.12.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 03 Mar 2021 12:57:06 +0000
-
-kaccounts-integration (4:20.12.2-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 03 Feb 2021 11:12:08 +0000
-
-kaccounts-integration (4:20.12.1-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021.12.23:20 +0000
-
-kaccounts-integration (4:20.12.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 10 Dec 2020 13:32:40 +0000
-
-kaccounts-integration (4:20.08.3-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 06 Nov 2020 07:05:00 +0000
-
-kaccounts-integration (4:20.08.2-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 06 Oct 2020 10:20:17 +0000
-
-kaccounts-integration (4:20.08.1-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 02 Sep 2020 11:19:51 +0000
-
-kaccounts-integration (4:20.08.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 14 Aug 2020 09:12:52 +0000
-
-kaccounts-integration (4:20.04.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 09 Jul 2020 09:36:59 +0000
-
-kaccounts-integration (4:20.04.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 17 May 2020 22:22:10 +0000
-
-kaccounts-integration (4:20.04.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 21 Apr 2020 17:44:52 +0000
-
-kaccounts-integration (4:19.12.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 04 Mar 2020 10:55:47 +0000
-
-kaccounts-integration (4:19.12.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 05 Feb 2020 13:44:35 +0000
-
-kaccounts-integration (4:19.12.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 08 Jan 2020 17:14:38 +0000
-
-kaccounts-integration (4:19.12.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 10 Dec 2019 18:50:08 +0000
-
-kaccounts-integration (4:19.08.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 06 Nov 2019 10:07:22 +0000
-
-kaccounts-integration (4:19.08.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 09 Oct 2019 18:06:44 +0000
-
-kaccounts-integration (4:19.08.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 05 Sep 2019 14:20:36 +0000
-
-kaccounts-integration (4:19.08.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 13 Aug 2019 13:17:55 +0000
-
-kaccounts-integration (4:19.04.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 10 Jul 2019 11:34:12 +0000
-
-kaccounts-integration (4:19.04.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 06 Jun 2019 09:58:09 +0000
-
-kaccounts-integration (4:19.04.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 09 May 2019 06:30:53 +0000
-
-kaccounts-integration (4:19.04.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 15 Apr 2019 14:08:54 +0000
-
-kaccounts-integration (4:18.12.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 06 Mar 2019 15:00:31 +0000
-
-kaccounts-integration (4:18.12.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 08 Feb 2019 10:57:28 +0000
-
-kaccounts-integration (4:17.08.3-1) unstable; urgency=medium
-
-  * Team upload.
-  * Upload to unstable.
-  * New upstream release.
-  * Adjust l10npkgs_firstversion_ok to the version where kde-l10n will
-    drop translations.
-  * Bump Standards-Version to 4.1.2, no changes required.
-  * Simplify watch file, and switch it to https.
-  * Remove unused debian/meta/cmake-ignore file.
-
- -- Pino Toscano <pino at debian.org>  Sun, 10 Dec 2017 15:46:53 +0100
-
-kaccounts-integration (4:17.08.0-1) experimental; urgency=medium
-
-  * New upstream release (17.08.0)
-  * Drop "deprecated" list missing
-  * Bump Standards-Version to 4.1.0.
-  * Update upstream metadata
-  * Bump group breaks (17.08)
-  * Release to experimental
-
- -- Maximiliano Curia <maxy at debian.org>  Mon, 11 Sep 2017 19:58:58 +0200
-
-kaccounts-integration (4:17.08.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 17 Aug 2017 09:31:56 +0000
-
-kaccounts-integration (4:17.04.3-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 12 Jul 2017 10:18:27 +0000
-
-kaccounts-integration (4:17.04.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 07 Jun 2017 12:20:22 +0000
-
-kaccounts-integration (4:17.04.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 11 May 2017 18:11:27 +0000
-
-kaccounts-integration (4:17.04.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 19 Apr 2017 13:02:51 +0000
-
-kaccounts-integration (4:16.12.3-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 08 Mar 2017 13:46:45 +0000
-
-kaccounts-integration (4:16.12.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 08 Feb 2017 16:56:13 +0000
-
-kaccounts-integration (4:16.12.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 11 Jan 2017 13:14:48 +0000
-
-kaccounts-integration (4:16.12.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 14 Dec 2016 16:23:56 +0000
-
-kaccounts-integration (4:16.08.3-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 21 Nov 2016 13:51:44 +0000
-
-kaccounts-integration (4:16.08.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 14 Oct 2016 13:38:44 +0000
-
-kaccounts-integration (4:16.08.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 16 Sep 2016 13:05:36 +0000
-
-kaccounts-integration (4:16.08.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 17 Aug 2016 11:47:37 +0000
-
-kaccounts-integration (16.08.3-1) unstable; urgency=medium
-
-  * New upstream release (16.08.3)
-
- -- Maximiliano Curia <maxy at debian.org>  Wed, 23 Nov 2016 20:54:31 +0100
-
-kaccounts-integration (16.08.2-1) unstable; urgency=medium
-
-  * New upstream release (16.08.2)
-
- -- Maximiliano Curia <maxy at debian.org>  Wed, 19 Oct 2016 00:04:42 +0200
-
-kaccounts-integration (16.04.2-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Jun 2016 09:39:04 +0200
-
-kaccounts-integration (16.04.1-1) unstable; urgency=medium
-
-  [ Automatic packaging ]
-  * Bump Standards-Version to 3.9.8
-  * Update symbols files with the logs from the buildds
-  * Update build-deps and deps with the info from cmake
-
-  [ Maximiliano Curia ]
-  * New upstream release (15.12.2).
-  * Replace the "Historical name" ddeb-migration by its "Modern, clearer" replacement dbgsym-migration.
-  * Add upstream metadata (DEP-12)
-  * debian/control: Update Vcs-Browser and Vcs-Git fields
-  * Add pkg-config build dependency
-  * Add new build dependency libaccounts-glib-dev
-  * Update install files
-
- -- Maximiliano Curia <maxy at debian.org>  Thu, 26 May 2016 10:50:11 +0200
-
-kaccounts-integration (15.12.1-1) experimental; urgency=medium
-
-  [ Maximiliano Curia ]
-  * New upstream release.
-  * Add libkf5declarative-dev to Build-Depends.
-  * New upstream release (15.12.1).
-
-  [ Diane Trout ]
-  * Update vcs urls to use secure urls.
-
- -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:41 +0100
-
-kaccounts-integration (15.08.3-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Change my email address back
-  * Update symbols file with new symbols.
-
- -- Diane Trout <diane at ghic.org>  Fri, 04 Dec 2015 10:55:04 -0800
-
-kaccounts-integration (15.08.1-1) unstable; urgency=medium
-
-  [ Harald Sitter ]
-  * Initial release.
-
-  [ Maximiliano Curia ]
-  * New upstream release (15.04.0).
-  * New upstream release (15.04.1).
-  * New upstream release (15.04.2).
-
-  [ Diane Trout ]
-  * New upstream release (15.04.3).
-  * Add support for running unit tests.
-    - add xauth and xvfb to Build-Depends.
-    - override_dh_auto_test to manually run ctest
-      because the test kaccounts-testnetattachjobs
-      configures kwallet which opens up a GUI for
-      configuring, and unlocking the wallet.
-      The "cd obj-*" to change to the build directory
-      should be fixed.
-  * Update libkaccounts1.install for new library filename
-  * Add KDE's unstable release url.
-  * New upstream release (15.08.0).
-  * New upstream release (15.08.1).
-  * Add qtdeclarative5-dev to build-dependes
-  * Add myself to uploaders
-  * Add qml-module-org-kde-kaccounts package.
-  * Add libaccounts-qt5-dev, libkf5coreaddons-dev, libsignonq-qt5-dev
-    dependencies to libkaccounts-dev.
-  * Add signon-plugin-password and signon-ui-x11 dependencies to
-    kaccounts-integration. (To match kubuntu)
-  * Add --list-missing to dh_install to make sure everything installed.
-
- -- Diane Trout <diane at debian.org>  Sun, 20 Sep 2015 22:21:04 -0700
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index b924e76..2c088b2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,99 +1,89 @@
-Source: kaccounts-integration
+Source: kaccounts6-integration
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Diane Trout <diane at ghic.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.0.0~),
-               libaccounts-glib-dev (>= 1.21~),
-               libaccounts-qt5-dev (>= 1.13~),
-               libkf5config-dev (>= 5.4.0~),
-               libkf5coreaddons-dev (>= 5.4.0~),
-               libkf5dbusaddons-dev (>= 5.4.0~),
-               libkf5declarative-dev (>= 5.4.0~),
-               libkf5i18n-dev (>= 5.4.0~),
-               libkf5iconthemes-dev (>= 5.4.0~),
-               libkf5kcmutils-dev (>= 5.4.0~),
-               libkf5kio-dev (>= 5.4.0~),
-               libkf5wallet-dev (>= 5.4.0~),
-               libkf5widgetsaddons-dev (>= 5.4.0~),
-               libsignon-qt5-dev (>= 8.55~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               libaccounts-glib-dev,
+               libaccounts-qt6-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcolorscheme-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kcmutils-dev,
+               kf6-kio-dev,
+               kf6-kpackage-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               libsignon-qt6-dev,
                pkg-config,
-               pkg-kde-tools (>> 0.15.15),
-               qcoro-qt5-dev,
-               qtbase5-dev (>= 5.4),
-               qtdeclarative5-dev (>= 5.2.0~),
+               pkg-kde-tools-neon,
+               qcoro-qt6-dev,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               libsignon-qt6-dev,
                xauth,
                xvfb
-Standards-Version: 4.1.2
+Standards-Version: 4.6.1
 Homepage: https://projects.kde.org/projects/kde/kdenetwork/kaccounts-integration
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kaccounts-integration
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kaccounts-integration.git
 
-Package: kaccounts-integration
+Package: kaccounts6-integration
 Architecture: any
-Depends: libkaccounts2 (= ${binary:Version}),
-         qml-module-org-kde-kaccounts,
-         qml-module-org-kde-kcm,
-         signon-kwallet-extension,
+Depends: libkaccounts6-2 (= ${binary:Version}),
+         qml6-module-org-kde-kaccounts,
+         qml6-module-org-kde-kcm,
+#         signon-kwallet6-extension,
          signon-plugin-oauth2,
          signon-plugin-password,
          signon-ui-x11,
          signond,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kde-config-telepathy-accounts (<< 17.08),
-        libktpcommoninternals9 (<< 17.08),
-        ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: System to administer web accounts
  Small system to administer web accounts for the sites and services
  across the Plasma desktop, including: Google, Facebook, Owncloud, IMAP,
  Jabber and others.
 
-Package: libkaccounts-dev
+Package: libkaccounts6-dev
 Section: libdevel
 Architecture: any
-Depends: libaccounts-glib-dev (>= 1.21~),
-         libaccounts-qt5-dev (>= 1.13~),
-         libkaccounts2 (= ${binary:Version}),
-         libkf5coreaddons-dev (>= 5.4.0~),
-         libsignon-qt5-dev (>= 8.55~),
+Depends: libaccounts-glib-dev,
+         libaccounts-qt6-dev,
+         libkaccounts6-2 (= ${binary:Version}),
+         kf6-kcoreaddons-dev,
+         libsignon-qt6-dev,
          pkg-config,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
-Replaces: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
 Description: System to administer web accounts - development files
  Small system to administer web accounts for the sites and services across the
  Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
  .
- This package contains development files.
+ This package contains the Qt6 based development files.
 
-Package: libkaccounts2
+Package: libkaccounts6-2
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kaccounts-integration (<= 0.0+git20141209.1543+15.04),
-        kaccounts-providers (<< 4:17.08),
-        kde-config-telepathy-accounts (<< 17.08),
-        kde-telepathy-auth-handler (<< 17.08),
-        kde-telepathy-kaccounts (<< 17.08),
-        libkaccounts1
-Replaces: kaccounts-integration (<= 0.0+git20141209.1543+15.04)
 Description: System to administer web accounts - shared library
  Small system to administer web accounts for the sites and services across the
  Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
  .
- This package contains the shared library.
+ This package contains the Qt6 shared library.
 
-Package: qml-module-org-kde-kaccounts
+Package: qml6-module-org-kde-kaccounts
 Architecture: any
 Multi-arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: KAccounts QtDeclarative QML Support
+Description: KAccounts QtDeclarative QML6 Support
  Contains a plugin for QtDeclarative that provides
  support for using KAccounts components written
  in QML.
diff --git a/debian/kaccounts-integration.install b/debian/kaccounts-integration.install
deleted file mode 100644
index 5261d56..0000000
--- a/debian/kaccounts-integration.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/*/qt5/plugins/kaccounts/daemonplugins/kaccounts_kio_webdav_plugin.so
-usr/lib/*/qt5/plugins/kf5/kded/kded_accounts.so
-usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_kaccounts.so
-usr/share/applications/kcm_kaccounts.desktop
-usr/share/kpackage/kcms
-usr/share/locale/
diff --git a/debian/kaccounts6-integration.install b/debian/kaccounts6-integration.install
new file mode 100644
index 0000000..c1e263d
--- /dev/null
+++ b/debian/kaccounts6-integration.install
@@ -0,0 +1,5 @@
+usr/lib/*/qt6/plugins/kaccounts/daemonplugins/kaccounts_kio_webdav_plugin.so
+usr/lib/*/qt6/plugins/kf6/kded/kded_accounts.so
+usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_kaccounts.so
+usr/share/applications/kcm_kaccounts.desktop
+usr/share/locale/
diff --git a/debian/libkaccounts-dev.acc.in b/debian/libkaccounts-dev.acc.in
deleted file mode 100644
index 4e23d14..0000000
--- a/debian/libkaccounts-dev.acc.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    15.04.0
-</version>
-
-<headers>
-    /usr/include/KAccounts/
-</headers>
-
-<libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libkaccounts.so
-</libs>
-
-<gcc_options>
-    -fPIC
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkaccounts2.install b/debian/libkaccounts6-2.install
similarity index 100%
rename from debian/libkaccounts2.install
rename to debian/libkaccounts6-2.install
diff --git a/debian/libkaccounts6-2.lintian-overrides b/debian/libkaccounts6-2.lintian-overrides
new file mode 100644
index 0000000..dc07abf
--- /dev/null
+++ b/debian/libkaccounts6-2.lintian-overrides
@@ -0,0 +1 @@
+libkaccounts6-2: package-name-doesnt-match-sonames libkaccounts2
diff --git a/debian/libkaccounts-dev.install b/debian/libkaccounts6-dev.install
similarity index 100%
rename from debian/libkaccounts-dev.install
rename to debian/libkaccounts6-dev.install
diff --git a/debian/qml-module-org-kde-kaccounts.install b/debian/qml-module-org-kde-kaccounts.install
deleted file mode 100644
index 4849c4d..0000000
--- a/debian/qml-module-org-kde-kaccounts.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/kaccounts/libkaccountsdeclarativeplugin.so
-usr/lib/*/qt5/qml/org/kde/kaccounts/qmldir
diff --git a/debian/qml6-module-org-kde-kaccounts.install b/debian/qml6-module-org-kde-kaccounts.install
new file mode 100644
index 0000000..0b6094f
--- /dev/null
+++ b/debian/qml6-module-org-kde-kaccounts.install
@@ -0,0 +1,4 @@
+usr/lib/*/qt6/qml/org/kde/kaccounts/libkaccountsdeclarativeplugin.so
+usr/lib/*/qt6/qml/org/kde/kaccounts/qmldir
+usr/lib/*/qt6/qml/org/kde/kaccounts/kaccountsdeclarativeplugin.qmltypes
+usr/lib/*/qt6/qml/org/kde/kaccounts/kde-qmlmodule.version
diff --git a/debian/rules b/debian/rules
index ed9766e..9534c7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,9 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:16.04.3-8~
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kaccounts-integration-dbg (<= 15.12.1-1~~)'
-
-override_dh_auto_test:
-	cd obj-* ; xvfb-run -a ctest -E kaccounts-testnetattachjobs
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list