diff -pruN 22.12.3-1/debian/changelog 22.12.3-0ubuntu1/debian/changelog
--- 22.12.3-1/debian/changelog	2023-03-01 20:31:51.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/changelog	2023-03-02 00:40:11.000000000 +0000
@@ -1,471 +1,355 @@
-kmbox (22.12.3-1) unstable; urgency=medium
+kmbox (22.12.3-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.12.3).
-  * Update build-deps and deps with the info from cmake.
-  * Remove inactive uploaders, thanks for your work.
+  * New upstream release (22.12.3)
 
- -- Patrick Franz <deltaone@debian.org>  Wed, 01 Mar 2023 21:31:51 +0100
+ -- Rik Mills <rikmills@kde.org>  Thu, 02 Mar 2023 00:40:11 +0000
 
-kmbox (22.12.2-1) unstable; urgency=medium
+kmbox (22.12.2-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.12.2).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (22.12.2)
 
- -- Patrick Franz <deltaone@debian.org>  Sun, 05 Feb 2023 00:25:19 +0100
+ -- Simon Quigley <tsimonq2@kubuntu.org>  Sat, 11 Feb 2023 14:20:04 -0600
 
-kmbox (22.12.0-2) unstable; urgency=medium
+kmbox (22.12.1-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * Upload to unstable.
+  * New upstream release (22.12.1)
 
- -- Patrick Franz <deltaone@debian.org>  Wed, 04 Jan 2023 21:36:02 +0100
+ -- Rik Mills <rikmills@kde.org>  Mon, 09 Jan 2023 17:26:28 +0000
 
-kmbox (22.12.0-1) experimental; urgency=medium
+kmbox (22.12.0-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.12.0).
-  * Update build-deps and deps with the info from cmake.
-  * Bump Standards-Version to 4.6.2 (No changes needed).
+  * New upstream release (22.12.0)
 
- -- Patrick Franz <deltaone@debian.org>  Thu, 22 Dec 2022 21:03:01 +0100
+ -- Rik Mills <rikmills@kde.org>  Fri, 09 Dec 2022 19:11:35 +0000
 
-kmbox (22.08.3-1) unstable; urgency=medium
+kmbox (22.11.90-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.08.3).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream (RC) release (22.11.90)
 
- -- Patrick Franz <deltaone@debian.org>  Fri, 04 Nov 2022 21:53:29 +0100
+ -- Rik Mills <rikmills@kde.org>  Fri, 25 Nov 2022 16:07:54 +0000
 
-kmbox (22.08.2-1) unstable; urgency=medium
+kmbox (22.11.80-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.08.2).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream (beta) release (22.11.80)
 
- -- Patrick Franz <deltaone@debian.org>  Sat, 29 Oct 2022 00:10:57 +0200
+ -- Rik Mills <rikmills@kde.org>  Thu, 17 Nov 2022 10:39:53 +0000
 
-kmbox (22.08.0-2) unstable; urgency=medium
+kmbox (22.08.3-0ubuntu1) lunar; urgency=medium
 
-  [ Patrick Franz ]
-  * Upload to unstable.
+  * New upstream release (22.08.2)
+  * New upstream release (22.08.3)
 
- -- Patrick Franz <deltaone@debian.org>  Sat, 10 Sep 2022 13:08:41 +0200
+ -- Rik Mills <rikmills@kde.org>  Mon, 07 Nov 2022 11:11:07 +0000
 
-kmbox (22.08.0-1) experimental; urgency=medium
+kmbox (22.08.1-0ubuntu1) kinetic; urgency=medium
 
-  [ Patrick Franz ]
-  * Update upstream signing-key.
-  * Bump Standards-Version to 4.6.1 (No changes needed).
-  * New upstream release (22.08.0).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (22.08.1)
 
- -- Patrick Franz <deltaone@debian.org>  Wed, 31 Aug 2022 01:45:30 +0200
+ -- Rik Mills <rikmills@kde.org>  Thu, 08 Sep 2022 07:42:19 +0100
 
-kmbox (22.04.3-1) unstable; urgency=medium
+kmbox (22.08.0-0ubuntu1) kinetic; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.04.3).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (22.08.0)
 
- -- Patrick Franz <deltaone@debian.org>  Thu, 14 Jul 2022 21:56:54 +0200
+ -- Rik Mills <rikmills@kde.org>  Wed, 24 Aug 2022 09:51:57 +0100
 
-kmbox (22.04.2-2) unstable; urgency=medium
+kmbox (22.04.3-0ubuntu1) kinetic; urgency=medium
 
-  [ Patrick Franz ]
-  * Upload to unstable.
+  * New upstream release (22.04.3)
 
- -- Patrick Franz <deltaone@debian.org>  Mon, 27 Jun 2022 22:00:54 +0200
+ -- Rik Mills <rikmills@kde.org>  Thu, 07 Jul 2022 09:29:34 +0100
 
-kmbox (22.04.2-1) experimental; urgency=medium
+kmbox (22.04.2-0ubuntu1) kinetic; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.04.2).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (22.04.2)
 
- -- Patrick Franz <deltaone@debian.org>  Sun, 19 Jun 2022 02:46:30 +0200
+ -- Rik Mills <rikmills@kde.org>  Thu, 09 Jun 2022 08:03:49 +0100
 
-kmbox (22.04.1-1) experimental; urgency=medium
+kmbox (22.04.1-0ubuntu1) kinetic; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (22.04.1).
-  * Update build-deps and deps with the info from cmake.
-  * Update list of installed files.
+  * New upstream release (22.04.1)
 
- -- Patrick Franz <deltaone@debian.org>  Wed, 25 May 2022 21:45:37 +0200
+ -- Rik Mills <rikmills@kde.org>  Wed, 11 May 2022 21:02:37 +0100
 
-kmbox (21.12.3-2) unstable; urgency=medium
+kmbox (22.04.0-0ubuntu1) kinetic; urgency=medium
 
-  [ Patrick Franz ]
-  * Upload to unstable.
+  * New upstream release (22.04.0)
+  * Update install files.
 
- -- Patrick Franz <deltaone@debian.org>  Fri, 01 Apr 2022 22:09:05 +0200
+ -- Rik Mills <rikmills@kde.org>  Mon, 02 May 2022 06:50:12 +0100
 
-kmbox (21.12.3-1) experimental; urgency=medium
+kmbox (21.12.3-0ubuntu1) jammy; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (21.12.3).
-  * Update build-deps and deps with the info from cmake.
-  * Add myself to Uploaders.
+  * New upstream release (21.12.3)
 
- -- Patrick Franz <deltaone@debian.org>  Thu, 24 Mar 2022 23:17:35 +0100
+ -- Rik Mills <rikmills@kde.org>  Thu, 03 Mar 2022 10:12:50 +0000
 
-kmbox (21.08.1-1) unstable; urgency=medium
+kmbox (21.12.2-0ubuntu1) jammy; urgency=medium
 
-  [ Norbert Preining ]
-  * New upstream release (21.08.1).
-  * Bump Standards-Version to 4.6.0, no change required.
+  [ José Manuel Santamaría Lema ]
+  * Update debian/watch
+  * Update upstream signing key
 
- -- Norbert Preining <norbert@preining.info>  Sat, 11 Sep 2021 07:23:10 +0900
+  [ Rik Mills ]
+  * New upstream release (21.12.2)
 
-kmbox (21.08.0-1) unstable; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Thu, 03 Feb 2022 07:19:26 +0000
 
-  [ Norbert Preining ]
-  * New upstream release (21.08.0).
+kmbox (21.12.1-0ubuntu1) jammy; urgency=medium
 
- -- Norbert Preining <norbert@preining.info>  Mon, 16 Aug 2021 16:18:11 +0900
+  * New upstream release (21.12.1)
 
-kmbox (21.04.3-1) experimental; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Thu, 06 Jan 2022 10:27:17 +0000
 
-  [ Norbert Preining ]
-  * New upstream release (21.04.3).
+kmbox (21.12.0-0ubuntu1) jammy; urgency=medium
 
- -- Norbert Preining <norbert@preining.info>  Fri, 09 Jul 2021 10:36:52 +0900
+  * New upstream release (21.12.0)
+  * Set maintainer to Kubuntu Developers.
 
-kmbox (21.04.1-1) experimental; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Thu, 09 Dec 2021 11:24:25 +0000
 
-  [ Norbert Preining ]
-  * New upstream release (21.04.1).
+kmbox (21.11.90-0ubuntu1) jammy; urgency=medium
 
- -- Norbert Preining <norbert@preining.info>  Fri, 14 May 2021 06:12:11 +0900
+  * New upstream (RC) release (21.11.90)
 
-kmbox (21.04.0-1) experimental; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Fri, 26 Nov 2021 13:19:39 +0000
 
-  [ Norbert Preining ]
-  * New upstream release (21.04.0).
-  * Borrow minimal upstream signing key from k3b.
-  * Drop Kubuntu from maintainer name.
-  * Removed Maximiliano Curia from the uploaders, thanks for your work
-    on the package!
-  * Added myself to the uploaders.
-  * Update list of installed files.
+kmbox (21.11.80-0ubuntu1) jammy; urgency=medium
 
- -- Norbert Preining <norbert@preining.info>  Thu, 13 May 2021 09:46:34 +0900
+  * New upstream (beta) release (21.11.80)
 
-kmbox (20.08.3-1) unstable; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Sun, 21 Nov 2021 23:31:10 +0000
 
-  [ Sandro Knauß ]
-  * New upstream release (20.08.3).
-  * Update build-deps and deps with the info from cmake.
-  * Bump Standards-Version to 4.5.1 (No changes needed).
-  * Minimize the upstream GPG signing key.
+kmbox (21.08.3-0ubuntu1) jammy; urgency=medium
 
- -- Sandro Knauß <hefee@debian.org>  Wed, 16 Dec 2020 01:39:47 +0100
+  [ José Manuel Santamaría Lema ]
+  * New upstream release (21.08.2)
 
-kmbox (20.08.2-2) unstable; urgency=medium
+  [ Rik Mills ]
+  * New upstream release (21.08.3)
 
-  * Team upload to unstable.
+ -- Rik Mills <rikmills@kde.org>  Mon, 15 Nov 2021 09:42:10 +0000
 
- -- Sandro Knauß <hefee@debian.org>  Tue, 20 Oct 2020 00:08:17 +0200
+kmbox (21.08.1-0ubuntu1) impish; urgency=medium
 
-kmbox (20.08.2-1) experimental; urgency=medium
+  * New upstream release (21.08.1)
 
-  [ Sandro Knauß ]
-  * New upstream release (20.08.2).
-  * Update build-deps and deps with the info from cmake.
-  * Update Homepage link to point to new invent.kde.org
-  * Update field Source in debian/copyright to invent.kde.org move.
-  * Update repository related entries to metadata file.
-  * Add Bug-* entries to metadata file.
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Thu, 09 Sep 2021 22:35:32 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Fri, 16 Oct 2020 00:52:28 +0200
+kmbox (21.08.0-0ubuntu1) impish; urgency=medium
 
-kmbox (20.04.1-2) unstable; urgency=medium
+  * New upstream release (21.08.0)
 
-  * Team upload.
-  * Switch from dhmk to the dh sequencer:
-    - invoke the dh sequencer using the kf5 addon
-    - call the right debhelper command instead of $(overridden_command)
-  * Unregister the old /etc/xdg/kmbox.categories, and
-    /etc/xdg/kmbox.renamecategories conffiles.
-  * Update lintian overrides.
+ -- Rik Mills <rikmills@kde.org>  Thu, 12 Aug 2021 09:04:28 +0100
 
- -- Pino Toscano <pino@debian.org>  Sat, 22 Aug 2020 22:04:32 +0200
+kmbox (21.07.90-0ubuntu1) impish; urgency=medium
 
-kmbox (20.04.1-1) unstable; urgency=medium
+  * New upstream (RC) release (21.07.90)
 
-  [ Sandro Knauß ]
-  * New upstream release (20.04.1).
-  * Update build-deps and deps with the info from cmake.
+ -- Rik Mills <rikmills@kde.org>  Mon, 02 Aug 2021 12:58:09 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Tue, 26 May 2020 23:59:54 +0200
+kmbox (21.07.80-0ubuntu1) impish; urgency=medium
 
-kmbox (20.04.0-1) experimental; urgency=medium
+  * New upstream (beta) release (21.07.80)
 
-  [ Sandro Knauß ]
-  * Update watch file to the new release-service location.
-  * Bump compat level to 13.
-  * Bump Standards-Version to 4.5.0 (No changes needed).
-  * Get rid of debug-symbol-migration package.
-  * Add Rules-Requires-Root field to control.
-  * New upstream release (19.12.3).
-  * Update build-deps and deps with the info from cmake.
-  * New upstream release (20.04.0).
-  * Enable hardening all.
-  * Wrap long lines in changelog entries: 16.04.1-1.
-  * Set field Upstream-Contact in debian/copyright.
-  * Remove obsolete fields Contact, Name from debian/upstream/metadata
-    (already present in machine-readable debian/copyright).
+ -- Rik Mills <rikmills@kde.org>  Mon, 19 Jul 2021 10:43:36 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Wed, 13 May 2020 12:22:34 +0200
+kmbox (21.04.3-0ubuntu1) impish; urgency=medium
 
-kmbox (19.08.3-1) unstable; urgency=medium
+  * New upstream release (21.04.3)
 
-  [ Sandro Knauß ]
-  * New upstream release (19.08.3).
-  * Update build-deps and deps with the info from cmake.
+ -- Rik Mills <rikmills@kde.org>  Thu, 08 Jul 2021 11:45:34 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Sat, 30 Nov 2019 22:54:47 +0100
+kmbox (21.04.2-0ubuntu1) impish; urgency=medium
 
-kmbox (19.08.2-1) experimental; urgency=medium
+  * New upstream release (21.04.2)
 
-  [ Sandro Knauß ]
-  * Bump Standards-Version to 4.4.1 (No changes needed).
-  * New upstream release (19.08.2).
-  * Update build-deps and deps with the info from cmake.
-  * Update install files for new upstream release.
+ -- Rik Mills <rikmills@kde.org>  Thu, 10 Jun 2021 10:42:18 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Fri, 08 Nov 2019 10:39:27 +0100
+kmbox (21.04.1-0ubuntu1) impish; urgency=medium
 
-kmbox (18.08.3-3) unstable; urgency=medium
+  * New upstream release (21.04.1)
 
-  * Release to unstable.
+ -- Rik Mills <rikmills@kde.org>  Thu, 13 May 2021 09:08:51 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Thu, 14 Nov 2019 23:49:51 +0100
+kmbox (21.04.0-0ubuntu1) impish; urgency=medium
 
-kmbox (18.08.3-2) experimental; urgency=medium
+  * New upstream release (21.04.0)
 
-  [ Sandro Knauß ]
-  * Bump Standards-Version to 4.4.0 (No changes needed).
-  * Bump compat level to 12.
-  * Add myself to Uploaders.
-  * Delete not needed Breaks/Confilcts.
-  * Use virtual packages to bundle KDEPIM.
-  * Enforce depdendencies between KDEPIM packages to enable bundling.
+ -- Rik Mills <rikmills@kde.org>  Thu, 29 Apr 2021 01:38:52 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Sat, 05 Oct 2019 00:04:57 +0200
+kmbox (20.12.3-0ubuntu1) hirsute; urgency=medium
 
-kmbox (18.08.3-1) unstable; urgency=medium
+  * New upstream release (20.12.3)
 
-  * Team upload.
+ -- Rik Mills <rikmills@kde.org>  Thu, 04 Mar 2021 15:22:34 +0000
 
-  [ Sandro Knauß ]
-  * New upstream release (18.08.3).
-  * Update build-deps and deps with the info from cmake.
-  * Bump Standards-Version to 4.3.0 (No changes needed).
-  * Removed acc autopkgtest.
-  * Removed testsuite autopkgtest.
+kmbox (20.12.2-0ubuntu1) hirsute; urgency=medium
 
- -- Sandro Knauß <hefee@debian.org>  Mon, 04 Feb 2019 15:59:27 +0100
+  * New upstream release (20.12.2)
 
-kmbox (18.08.1-1) unstable; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Thu, 04 Feb 2021 09:56:17 +0000
 
-  * Team upload.
+kmbox (20.12.1-0ubuntu1) hirsute; urgency=medium
 
-  [ Sandro Knauß ]
-  * Bump Standards-Version to 4.2.1 (No changes needed).
-  * New upstream release (18.08.1).
-  * Follow stable releases in KDE again.
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (20.12.1)
 
- -- Sandro Knauß <hefee@debian.org>  Tue, 02 Oct 2018 23:18:14 +0200
+ -- Rik Mills <rikmills@kde.org>  Wed, 20 Jan 2021 23:11:32 +0000
 
-kmbox (18.07.90-1) experimental; urgency=medium
+kmbox (20.12.0-0ubuntu1) hirsute; urgency=medium
 
-  * Team upload.
+  * New upstream release (20.12.0)
+  * Update install files.
 
-  [ Sandro Knauß ]
-  * Update watch file to match unstable releases, too.
-  * New upstream release (18.07.90).
-  * Bump Standards-Version to 4.2.0 (No changes needed).
-  * Update build-deps and deps with the info from cmake.
-  * Update copyright file for new upstream.
+ -- Rik Mills <rikmills@kde.org>  Fri, 11 Dec 2020 14:29:31 +0000
 
- -- Sandro Knauß <hefee@debian.org>  Fri, 17 Aug 2018 18:17:20 +0200
+kmbox (20.08.3-0ubuntu1) hirsute; urgency=medium
 
-kmbox (17.12.3-1) unstable; urgency=medium
+  * New upstream release (20.08.3)
 
-  * Team upload.
+ -- Rik Mills <rikmills@kde.org>  Wed, 11 Nov 2020 09:53:46 +0000
 
-  [ Sandro Knauß ]
-  * New upstream release (17.12.3).
-  * Update build-deps and deps with the info from cmake.
-  * use secure copyright format uri.
-  * Use secure uri in d/watch.
+kmbox (20.08.1-0ubuntu1) groovy; urgency=medium
 
- -- Sandro Knauß <hefee@debian.org>  Sat, 31 Mar 2018 18:26:04 +0200
+  * New upstream release (20.08.1)
 
-kmbox (17.12.2-1) experimental; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Thu, 03 Sep 2020 13:55:48 +0100
 
-  * Team upload.
+kmbox (20.08.0-0ubuntu1) groovy; urgency=medium
 
-  [ Sandro Knauß ]
-  * New upstream release (17.12.2).
-  * Update Vcs links to salsa.
-  * Update build-deps and deps with the info from cmake
-  * Bump Standards-Version to 4.1.3 (No changes needed).
-  * Enable build tests.
-  * Bump debhelper build-dep and compat to 11.
+  * New upstream release (20.08.0)
+  * Update symbols.
 
- -- Sandro Knauß <hefee@debian.org>  Fri, 09 Mar 2018 15:14:39 +0100
+ -- Rik Mills <rikmills@kde.org>  Wed, 26 Aug 2020 12:20:55 +0100
 
-kmbox (17.08.3-1) unstable; urgency=medium
+kmbox (19.12.3-0ubuntu1) focal; urgency=medium
 
-  * Team upload.
+  * Move qdebug categories files to new location.
+  * New upstream release (19.12.3)
 
-  [ Sandro Knauß ]
-  * New upstream release (17.08.3).
-  * Mark libkf5mbox-dev corretly as Multi-Arch: same.
-  * Bump Standards-Version to 4.1.2 (No changes needed).
-  * Remove not needed Build-Deps.
-  * Bump debhelper build-dep and compat to 10.
+ -- Rik Mills <rikmills@kde.org>  Sat, 11 Apr 2020 13:58:40 +0100
 
- -- Sandro Knauß <hefee@debian.org>  Thu, 21 Dec 2017 17:56:29 +0100
+kmbox (19.04.3-0ubuntu1) eoan; urgency=medium
 
-kmbox (17.08.0-1) experimental; urgency=medium
+  * New upstream release (19.04.3)
 
-  * New revision
-  * Bump Standards-Version to 4.0.1.
-  * Update upstream metadata
-  * Update build-deps and deps with the info from cmake
-  * Bump group breaks (17.08)
-  * Release to experimental
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 23 Jul 2019 18:55:27 +0100
 
- -- Maximiliano Curia <maxy@debian.org>  Fri, 01 Sep 2017 22:13:11 +0200
+kmbox (18.12.3-0ubuntu2) disco; urgency=medium
 
-kmbox (17.08.0-0neon) xenial; urgency=medium
+  * No-change rebuild for fixed akonadi server.
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Sun, 07 Apr 2019 17:46:17 +0100
 
- -- Neon CI <neon@kde.org>  Thu, 17 Aug 2017 09:37:10 +0000
+kmbox (18.12.3-0ubuntu1) disco; urgency=medium
 
-kmbox (17.04.3-0neon) xenial; urgency=medium
+  * New upstream release (18.12.3)
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Sat, 16 Mar 2019 15:05:54 +0000
 
- -- Neon CI <neon@kde.org>  Wed, 12 Jul 2017 10:22:40 +0000
+kmbox (18.04.3-0ubuntu2) disco; urgency=medium
 
-kmbox (17.04.2-0neon) xenial; urgency=medium
+  * Follow Debian dropping of autotests.
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 07 Feb 2019 08:13:51 +0000
 
- -- Neon CI <neon@kde.org>  Wed, 07 Jun 2017 12:22:35 +0000
+kmbox (18.04.3-0ubuntu1) cosmic; urgency=medium
 
-kmbox (17.04.1-0neon) xenial; urgency=medium
+  * Install debug categories file
+  * New upstream release (18.03.80)
+  * New upstream release (18.04.0)
+  * New upstream release (18.04.1)
+  * New upstream release (18.04.3)
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 21 Aug 2018 18:54:07 +0100
 
- -- Neon CI <neon@kde.org>  Thu, 11 May 2017 18:20:58 +0000
+kmbox (17.12.3-0ubuntu1) bionic; urgency=medium
 
-kmbox (17.04.0-0neon) xenial; urgency=medium
+  * New upstream release (17.12.3)
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 16 Mar 2018 13:28:38 +0000
 
- -- Neon CI <neon@kde.org>  Wed, 19 Apr 2017 13:04:43 +0000
+kmbox (17.12.2-0ubuntu1) bionic; urgency=medium
 
-kmbox (16.12.3-0neon) xenial; urgency=medium
+  * New upstream release (17.11.80)
+  * New upstream release (17.11.90)
+  * New upstream release (17.12.0)
+  * Follow debian marking libkf5mbox-dev as Multi-Arch: same
+  * New upstream release (17.12.2)
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Wed, 28 Feb 2018 09:45:12 +0000
 
- -- Neon CI <neon@kde.org>  Wed, 08 Mar 2017 13:49:23 +0000
+kmbox (17.08.3-0ubuntu1) bionic; urgency=medium
 
-kmbox (16.12.2-0neon) xenial; urgency=medium
+  * New upstream release (17.08.3)
 
-  * New release
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 01 Dec 2017 15:07:31 +0000
 
- -- Neon CI <neon@kde.org>  Wed, 08 Feb 2017 17:00:25 +0000
+kmbox (17.04.3-0ubuntu1) artful; urgency=low
 
-kmbox (16.12.1-0neon) xenial; urgency=medium
+  * New upstream release (17.04.1)
+  * New upstream release (17.04.2)
+  * New upstream release (17.04.3)
 
-  * New release
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Mon, 21 Aug 2017 14:31:43 +0100
 
- -- Neon CI <neon@kde.org>  Wed, 11 Jan 2017 13:20:19 +0000
+kmbox (16.12.3-0ubuntu1) artful; urgency=medium
 
-kmbox (16.12.0-0neon) xenial; urgency=medium
+  [ José Manuel Santamaría Lema ]
+  * Update Vcs-Git fields to use https:// instead of git://
+  * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to
+    avoid possible spurious test failures.
+  * New upstream release (16.12.3)
 
-  * New release
+  [ Rik Mills ]
+  * New upstream release (16.12.0)
+  * New upstream release (16.12.1)
 
- -- Neon CI <neon@kde.org>  Wed, 14 Dec 2016 16:28:55 +0000
+  [ Darin Miller ]
+  * New upstream release (16.12.2)
 
-kmbox (16.08.3-0neon) xenial; urgency=medium
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Mon, 01 May 2017 20:26:12 +0100
 
-  * New release
+kmbox (16.04.3-0ubuntu1) yakkety; urgency=medium
 
- -- Neon CI <neon@kde.org>  Mon, 21 Nov 2016 13:53:31 +0000
+  [ Scarlett Clark ]
+  * New upstream release
 
-kmbox (16.08.2-0neon) xenial; urgency=medium
+  [ Philip Muškovac ]
+  * Update the Vcs URLs now that the repositories are hosted on
+    Launchpad
 
-  * New release
+  [ Scarlett Clark ]
+  * Bump SO version install file 
+  * New upstream bugfix release
 
- -- Neon CI <neon@kde.org>  Fri, 14 Oct 2016 13:40:27 +0000
+  [ Clive Johnston ]
+  * New upstream release (16.04.2)
+  * New upstream release (16.04.3)
 
-kmbox (16.08.1-1~1.gbp8ff99a) UNRELEASED; urgency=medium
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Fri, 30 Sep 2016 06:37:21 +0200
 
-  ** SNAPSHOT build @8ff99a8823c3a527af272041fad922b15f423273 **
+kmbox (15.12.3-0ubuntu1) xenial; urgency=medium
 
-  [ Maximiliano Curia ]
-  ** SNAPSHOT build @91d899f3fd751864c94ce005a9f2015a67dd5e1f **
+  * New upstream bugfix release
+  * New upstream bugfix release
 
-  * UNRELEASED
+ -- Scarlett Clark <sgclark@kubuntu.org>  Thu, 14 Apr 2016 15:33:42 -0700
 
-  [ Automatic packaging ]
-  * Update build-deps and deps with the info from cmake
-  * Update build-deps and deps with the info from cmake
-
- -- Automatic packaging <maxy+jenkins@gnuservers.com.ar>  Fri, 09 Sep 2016 00:45:36 +0200
-
-kmbox (16.08.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon@kde.org>  Fri, 16 Sep 2016 13:07:10 +0000
-
-kmbox (16.08.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon@kde.org>  Wed, 17 Aug 2016 11:49:01 +0000
-
-kmbox (16.07.80-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon@kde.org>  Wed, 27 Jul 2016 16:44:13 +0000
-
-kmbox (16.04.2-1) unstable; urgency=medium
+kmbox (15.12.1-0ubuntu1) xenial; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release.
+  * Debian merge: No remaining changes. 
+  * Bump build depend version on pim*. 
 
- -- Maximiliano Curia <maxy@debian.org>  Tue, 21 Jun 2016 11:11:39 +0200
+  [ Clive Johnston ]
+  * Fixing install file 
 
-kmbox (16.04.1-1) unstable; urgency=medium
+  [ Scarlett Clark ]
+  * Fix merger. 
 
-  [ Automatic packaging ]
-  * Bump Standards-Version to 3.9.8
-  * Update symbols files with the logs from the buildds
-  * Add a .gitattributes file to use dpkg-mergechangelogs
-  * Update build-deps and deps with the info from cmake
-
-  [ Maximiliano Curia ]
-  * 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
-  * Update install files
-
- -- Maximiliano Curia <maxy@debian.org>  Sat, 28 May 2016 01:48:28 +0200
+ -- Scarlett Clark <sgclark@kubuntu.org>  Wed, 09 Mar 2016 10:51:58 +0100
 
 kmbox (15.12.0-2) experimental; urgency=medium
 
@@ -479,12 +363,31 @@ kmbox (15.12.0-1) experimental; urgency=
 
  -- Maximiliano Curia <maxy@debian.org>  Mon, 01 Feb 2016 10:23:15 +0100
 
+kmbox (15.12.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Clive Johnston <clivejo@aol.com>  Sat, 02 Jan 2016 14:03:12 +0000
+
+kmbox (15.08.2-0ubuntu1) wily; urgency=medium
+
+  * Vivid backport
+  * New upstream release
+
+ -- Scarlett Clark <sgclark@kubuntu.org>  Wed, 14 Oct 2015 12:33:58 +0100
+
 kmbox (15.08.1-1) experimental; urgency=medium
 
   * New upstream release (15.08.1).
 
  -- Maximiliano Curia <maxy@debian.org>  Sat, 19 Sep 2015 03:16:28 +0200
 
+kmbox (15.08.1-0ubuntu1) wily; urgency=medium
+
+  * New upstream release (15.08.1)
+
+ -- Clive Johnston <clivejo@aol.com>  Tue, 22 Sep 2015 17:07:52 +0100
+
 kmbox (15.08.0-1) experimental; urgency=medium
 
   * Initial Debian release.
diff -pruN 22.12.3-1/debian/compat 22.12.3-0ubuntu1/debian/compat
--- 22.12.3-1/debian/compat	1970-01-01 00:00:00.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/compat	2023-03-02 00:40:11.000000000 +0000
@@ -0,0 +1 @@
+10
diff -pruN 22.12.3-1/debian/control 22.12.3-0ubuntu1/debian/control
--- 22.12.3-1/debian/control	2023-03-01 18:25:02.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/control	2023-03-02 00:40:11.000000000 +0000
@@ -1,20 +1,21 @@
 Source: kmbox
 Section: libs
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Sandro Knauß <hefee@debian.org>,
-           Patrick Franz <deltaone@debian.org>,
-Build-Depends: cmake (>= 3.16~),
-               debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.99.0~),
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Maximiliano Curia <maxy@debian.org>
+Build-Depends: cmake (>= 2.8.12~),
+               debhelper (>= 11),
+               extra-cmake-modules (>= 5.31.0~),
+               libboost-dev,
+               libkf5kdelibs4support-dev (>= 5.31.0~),
                libkf5mime-dev (>= 22.12.3~),
                pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev,
-Standards-Version: 4.6.2
-Homepage: https://invent.kde.org/pim/kmbox
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kmbox
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kmbox.git
-Rules-Requires-Root: no
+               qtbase5-dev (>= 5.6.1~),
+Standards-Version: 3.9.6
+Homepage: https://projects.kde.org/projects/kde/pim/kmbox
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmbox
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmbox
 
 Package: libkf5mbox-dev
 Section: libdevel
@@ -22,7 +23,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkf5mbox5 (= ${binary:Version}),
          libkf5mime-dev (>= 22.12.3~),
-         qtbase5-dev,
+         qtbase5-dev (>= 5.6.1~),
          ${misc:Depends},
 Description: library for handling mbox mailboxes - development files
  This is a library for handling mailboxes in mbox format, using a Qt/KMime C++
@@ -33,10 +34,9 @@ Description: library for handling mbox m
 Package: libkf5mbox5
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for handling mbox mailboxes
  This is a library for handling mailboxes in mbox format, using a Qt/KMime C++
  API.
  .
  This package is part of the KDE Development Platform PIM libraries module.
-Provides: ${ABI:VirtualPackage},
diff -pruN 22.12.3-1/debian/copyright 22.12.3-0ubuntu1/debian/copyright
--- 22.12.3-1/debian/copyright	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/copyright	2023-03-02 00:40:11.000000000 +0000
@@ -1,7 +1,6 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kmbox
-Source: https://invent.kde.org/pim/kmbox
-Upstream-Contact: kde-devel@kde.org
+Source: http://download.kde.org/pub/kde/unstable/applications/
 
 Files: *
 Copyright: 2009, Bertjan Broeksema <broeksema@kde.org>
@@ -11,17 +10,18 @@ Copyright: 2009, Bertjan Broeksema <broe
 License: LGPL-2+
 
 Files: autotests/mboxtest.cpp
-Copyright: 2009, Bertjan Broeksema <broeksema@kde.org>
+Copyright: 2009 Bertjan Broeksema <broeksema@kde.org>
 License: LGPL-2
 
 Files: debian/*
 Copyright: 2015 Harald Sitter <sitter@kde.org>
 License: LGPL-2+
 
-License: LGPL-2
+License: LGPL-2+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,16 +31,15 @@ License: LGPL-2
  You should have received a copy of the GNU Library General Public License
  along with this library; see the file COPYING.LIB.  If not, write to
  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+ Boston, MA 02110-1301, USA.
  .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
-License: LGPL-2+
+License: LGPL-2
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ License version 2 as published by the Free Software Foundation.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -50,7 +49,7 @@ License: LGPL-2+
  You should have received a copy of the GNU Library General Public License
  along with this library; see the file COPYING.LIB.  If not, write to
  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+  Boston, MA 02110-1301, USA.
  .
- On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
diff -pruN 22.12.3-1/debian/libkf5mbox-dev.acc.in 22.12.3-0ubuntu1/debian/libkf5mbox-dev.acc.in
--- 22.12.3-1/debian/libkf5mbox-dev.acc.in	1970-01-01 00:00:00.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/libkf5mbox-dev.acc.in	2023-03-02 00:40:11.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?>
+<descriptor>
+
+<version>
+    15.07.90
+</version>
+
+<headers>
+    /usr/include/KF5/KMbox/
+    /usr/include/KF5/kmbox_version.h
+</headers>
+
+<libs>
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Mbox.so
+</libs>
+
+<gcc_options>
+    -fPIC
+    -fno-keep-inline-functions
+</gcc_options>
+
+</descriptor>
\ No newline at end of file
diff -pruN 22.12.3-1/debian/libkf5mbox-dev.lintian-overrides 22.12.3-0ubuntu1/debian/libkf5mbox-dev.lintian-overrides
--- 22.12.3-1/debian/libkf5mbox-dev.lintian-overrides	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/libkf5mbox-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# shipped like this by upstream
-libkf5mbox-dev: repeated-path-segment
diff -pruN 22.12.3-1/debian/libkf5mbox5.maintscript 22.12.3-0ubuntu1/debian/libkf5mbox5.maintscript
--- 22.12.3-1/debian/libkf5mbox5.maintscript	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/libkf5mbox5.maintscript	2023-03-02 00:40:11.000000000 +0000
@@ -1,2 +1,2 @@
-rm_conffile /etc/xdg/kmbox.categories 20.04.1-2~
-rm_conffile /etc/xdg/kmbox.renamecategories 20.04.1-2~
+rm_conffile /etc/xdg/kmbox.categories
+rm_conffile /etc/xdg/kmbox.renamecategories
diff -pruN 22.12.3-1/debian/libkf5mbox5.symbols 22.12.3-0ubuntu1/debian/libkf5mbox5.symbols
--- 22.12.3-1/debian/libkf5mbox5.symbols	1970-01-01 00:00:00.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/libkf5mbox5.symbols	2023-03-02 00:40:11.000000000 +0000
@@ -0,0 +1,39 @@
+# SymbolsHelper-Confirmed: 20.08.0 amd64 arm64 armhf ppc64el s390x
+libKF5Mbox.so.5 libkf5mbox5 #MINVER#
+ _ZN5KMBox4MBox11readMessageERKNS_9MBoxEntryE@Base 15.07.90
+ _ZN5KMBox4MBox11setLockFileERK7QString@Base 15.07.90
+ _ZN5KMBox4MBox11setLockTypeENS0_8LockTypeE@Base 15.07.90
+ _ZN5KMBox4MBox11setReadOnlyEb@Base 15.07.90
+ (optional=boost)_ZN5KMBox4MBox13appendMessageERK14QSharedPointerIN5KMime7MessageEE@Base 15.12.0
+ (optional=boost)_ZN5KMBox4MBox13appendMessageERKN5boost10shared_ptrIN5KMime7MessageEEE@Base 15.12.0
+ _ZN5KMBox4MBox14readRawMessageERKNS_9MBoxEntryE@Base 15.07.90
+ _ZN5KMBox4MBox16setUnlockTimeoutEi@Base 15.07.90
+ _ZN5KMBox4MBox18readMessageHeadersERKNS_9MBoxEntryE@Base 15.07.90
+ _ZN5KMBox4MBox4loadERK7QString@Base 15.07.90
+ _ZN5KMBox4MBox4lockEv@Base 15.07.90
+ _ZN5KMBox4MBox4saveERK7QString@Base 15.07.90
+ _ZN5KMBox4MBox5purgeERK7QVectorINS_9MBoxEntryEEPS1_I5QPairIS2_S2_EE@Base 20.08.0
+ _ZN5KMBox4MBox6unlockEv@Base 15.07.90
+ _ZN5KMBox4MBoxC1Ev@Base 15.07.90
+ _ZN5KMBox4MBoxC2Ev@Base 15.07.90
+ _ZN5KMBox4MBoxD1Ev@Base 15.07.90
+ _ZN5KMBox4MBoxD2Ev@Base 15.07.90
+ _ZN5KMBox9MBoxEntryC1ERKS0_@Base 15.07.90
+ _ZN5KMBox9MBoxEntryC1Ev@Base 15.07.90
+ _ZN5KMBox9MBoxEntryC1Ey@Base 15.07.90
+ _ZN5KMBox9MBoxEntryC2ERKS0_@Base 15.07.90
+ _ZN5KMBox9MBoxEntryC2Ev@Base 15.07.90
+ _ZN5KMBox9MBoxEntryC2Ey@Base 15.07.90
+ _ZN5KMBox9MBoxEntryD1Ev@Base 15.07.90
+ _ZN5KMBox9MBoxEntryD2Ev@Base 15.07.90
+ _ZN5KMBox9MBoxEntryaSERKS0_@Base 15.07.90
+ _ZNK5KMBox4MBox10isReadOnlyEv@Base 15.07.90
+ _ZNK5KMBox4MBox6lockedEv@Base 15.07.90
+ _ZNK5KMBox4MBox7entriesERK7QVectorINS_9MBoxEntryEE@Base 15.07.90
+ _ZNK5KMBox4MBox8fileNameEv@Base 15.07.90
+ _ZNK5KMBox9MBoxEntry11messageSizeEv@Base 15.07.90
+ _ZNK5KMBox9MBoxEntry13messageOffsetEv@Base 15.07.90
+ _ZNK5KMBox9MBoxEntry13separatorSizeEv@Base 15.07.90
+ _ZNK5KMBox9MBoxEntry7isValidEv@Base 15.07.90
+ _ZNK5KMBox9MBoxEntryeqERKS0_@Base 15.07.90
+ _ZNK5KMBox9MBoxEntryneERKS0_@Base 15.07.90
diff -pruN 22.12.3-1/debian/rules 22.12.3-0ubuntu1/debian/rules
--- 22.12.3-1/debian/rules	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/rules	2023-03-02 00:40:11.000000000 +0000
@@ -1,18 +1,10 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
-include /usr/share/dpkg/pkg-info.mk
+override_dh_strip:
+	$(overridden_command) --ddeb-migration='libkf5mbox-dbg (<= 15.12.0-1~~)'
 
-%:
-	dh $@ --with kf5
-
-AbiVirtualPackageVersion = $(call dpkg_late_eval,AbiVirtualPackageVersion,echo '${DEB_VERSION_UPSTREAM}' | sed -e 's/\.[0-9]\+$$//')
-pkgs_lib = $(filter-out %-dev %-dbg %-bin %-data,$(filter lib%,$(shell dh_listpackages)))
-
-override_dh_makeshlibs:
-	for pkg in $(pkgs_lib); do \
-		name=$$( echo "$${pkg}" | sed -e 's/abi[0-9]\+\s*//'); \
-		echo "ABI:VirtualPackage=$${name}-${AbiVirtualPackageVersion}" >> debian/$${pkg}.substvars; \
-		dh_makeshlibs -p$${pkg} -V "$${pkg} (>= $(DEB_VERSION_EPOCH_UPSTREAM)), $${name}-${AbiVirtualPackageVersion}"; \
-	done
+override_dh_auto_test:
+	# Disable auto test at build time, fakeroot breaks them
+	:
diff -pruN 22.12.3-1/debian/salsa/extra_repository.list 22.12.3-0ubuntu1/debian/salsa/extra_repository.list
--- 22.12.3-1/debian/salsa/extra_repository.list	2020-11-18 00:46:39.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/salsa/extra_repository.list	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-deb https://qt-kde-team.debian.net/debian qt-kde-snapshots main
diff -pruN 22.12.3-1/debian/salsa/qt-kde-team.debian.net.asc 22.12.3-0ubuntu1/debian/salsa/qt-kde-team.debian.net.asc
--- 22.12.3-1/debian/salsa/qt-kde-team.debian.net.asc	2020-11-18 00:46:39.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/salsa/qt-kde-team.debian.net.asc	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFbRhD8BEADR1NNpDI/ekbEMKy0rn8wYWMFgkdg8T7U7iok+QbNd6pad7ZmY
-vMZ9YydyKFDXzrXdx06SFDUMdFnYHhedReROJF3C6/IWBQHHKsad1cxu6HtHwBER
-P7CMqyjwbQaNf7VR40iSPLiSH4AhpW4L9G0POCrl3oMVKRreMhk86aST6H5YLafb
-CTwoELE5GU50pNMena98MUdjCrDNPRdUu1+GFxjjGB5T2ESeQ1zsa1OhMxHw8dgt
-pk35WTyD5ETGYs6JVpN1GYvGruCm6dKjMMgIiH0OO7oNUtkqiUE/jAzb0UEX1VqS
-d74QrFpqfRpDy+gatglYt3aK1k6HX2aGR3NJshtjejjVhDpOTn8oQrslD+Rtn7nN
-bdzf5agYFzyfWBA/466VXWpRp0n+2QfDYnpabuzKN+CYaWsIdpNgVgr3PshpTzKV
-vN3wle0V5kEeA1wO5lNRcc+NG98SvL+gNIrH0BZzNOVKAGuZ83pm2cr636IJSBTo
-wP40+RWCy5skB67s6MlXa3tq4Q/EVoL9VdgyffOQHgVb6d2jMiXXEjPYqPVnsWkp
-w7+PgqaH32wLKwyUbYRz21WVzkwbFr7LvDgaj0PiI9r5c/qN4cKmi4+1zgJuAFOh
-wjKbRIzFOApYmcIWXA8suVhUHgzKye1Cix4mD0eoKIGA2nM+wEvLy0DcaQARAQAB
-tDxMWFF0IFBhY2thZ2luZyBUZWFtIDxwa2ctbHhxdC1kZXZlbEBsaXN0cy5hbGlv
-dGguZGViaWFuLm9yZz6JAjcEEwEKACEFAlbRhD8CGwMFCwkIBwMFFQoJCAsFFgID
-AQACHgECF4AACgkQOgXVl5oByVEhUxAAp3TQOStOjwRN26/I4YFeMttDQ3AlWuSB
-PycTZbkHoZLNkvIJJuzoXkGXiGZLA7UVuEPTEztB3Bo3IgB+FiDkXWUtG5qj42KV
-vqGYq8IjIO8gxRQH+ZK0aiPIZrcCE2z7jFi5ocGVDveS9PbXs7FxVnuP+nBvpuI9
-e43rJM5VgQZbVQbqSmyeaM5KFd+izTfkm0qDVRz6X0l+q1lb2fRjalYXtrueeQro
-0E7r1QrYgCxvWT8L71E8eRAdrDbmtCTUebIE/Dle6TDm/tagS9I05COEdOFi2SPa
-I4esRzU1tuQxtCVb8E+1rSi1wmNRQSDr2GumIGAJC8ME5StuntwLAJXbzWu/NjJT
-uNz2noyfk4ZRNVRuJAZjFivJQqAC1ycRJpLPZuHFJy8Z+8ugKD3sE6MJJfM/tZi1
-hD1nZzgV35uPo2kgVe96zZQlDAZJVlNIF5GOFNOgSN/s+Bq8/zmBJGrkz6/kwRp7
-dJJG1BSMGoyi1vh3Iy9H+Eq1TYd2C1u3GbV2wE7UR2d9Obt+NmCwTpG0nimsW0DD
-KNNuzkgBjBQUpt0b99gJULI6aYxWFIvTD77fsmjaKgnlx4shS0y4i+L5sOWqdTXX
-ICu+Xnq0ROzmf1+aOGeR500RR7OjU+PmShDklmdE5Ss3Hzqi36tTipGpjKDaDoKA
-lM6xZCxUi+25Ag0EVtGEPwEQALR3uffc7bq+xGUVUtCiEbeOYvEDYzoZPvt/Yu57
-BQ56Ar/SkrKthAt7C+IMOJ2NJDHRWtkcYOqQqb4anAlf9a7NSkIwtZh4KeXfA6VZ
-3T3JubIrMcO0YFKi11wga2BNkDPv+z9MdYPq9ocoP7pyIWSz70TE/Yo1aaA18l6g
-Rx1Wdg/+vjrNjcz8BVEM1szaZTGSb8W2lPqESiG/lTUC90rGKh+7fbEOJPvf1CG9
-wzGgH5NhcU4evu14obvQTwmXo6XPjmx7YtvcfQynNBECdJOyZg2O6qR4wwMKYzSU
-+U0KnntCxSFGt4cspnMvnC13DhRmfRJoZxCaCA2GE6ThLu6aqAqcXvaUQUZRP9o/
-HIQm4rEPaZSdJq4pgPv8QKOXWhvk88uh0xW5j2tYyrS8klok42tXIKmGhYej13rJ
-e2CJ57bZTGz12ferGCLUUMTH3oAUxdzykrao/gDk+kKxxYpCe6MAbtamVbsBbiar
-rp11y4WhLmeb69SXrE2uNJSf71f7GvjjiZQoCvRJL/1OFtpUCj/c8Dz+8gnMsPwU
-lXJa7tbsxLrOhkNf/clBt4Nf/v60o7Ig9glgyuNXc2cq8VtP+vU3Pde1GNJp4qsP
-JgmlU97n1eIdubg2o7HBsSBJ860+Fn2CfnO1umQoMP0uzF4M5fyfTWXy0A/DgFEH
-7o03ABEBAAGJAh8EGAEKAAkFAlbRhD8CGwwACgkQOgXVl5oByVHfeA/9HCaVGqpv
-RaZa5ciomYsg9vsZoMB6WhM1kyG11utwgV+Hl9XhktAFFo6B9BnyzhxYGn8Tcefi
-Et3lKi/vt6vvk9BU5sKmE9Pt+T9tnjK8MKcOHco0bmnCByE6HZxtVkcSlYgnyf4s
-II9kQoSADwwodQn4f5JSb9NIxHxBD+Aga3d4yYBDOLrBzW2BN6xilqTGZpcMioht
-8VIOvs/YUOpLhZuARtPszCUjGB/WGspQlrIldSRIpvshSUd79SrcYM5OyzeuF7aP
-h1xt+3l5kxDE1oKYgW9rKycp6liillOQyZlIJmeU2D30IqVQshYDfYvy/3cL9TO6
-CcYGkBaFFf8fKGEEBWG35M0+PXaiivQ2efBfekt1i3MaFn25t2Lgjt31wKjZqRfZ
-xRFodkRx/qSxZcaJU8NYSxVC2OEwlEIN0v3/eWZMOzYwFvCcg/a3M7ARlQOwt1YZ
-Lsj83SJ263KjdGpgDE0Rk6B416dT/vClRmGg5jyX05keymzzfl//z93rerwPqbV/
-ygi4vRVswBSrACwRKXEzaUEeutGX8L49XFNi/p5gYL8RCTGOM4PxD5AmTC7+VnnO
-T1155UsunpBrlFUTKhxJGUux11TgojiGJY3ID7fP8EqyZWp6z3CXqXTxv8CP8Ye1
-bMTcHe5rk6snXqz1neEmP2K7qdNwwakRdAA=
-=o8PI
------END PGP PUBLIC KEY BLOCK-----
diff -pruN 22.12.3-1/debian/salsa-ci.yml 22.12.3-0ubuntu1/debian/salsa-ci.yml
--- 22.12.3-1/debian/salsa-ci.yml	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-include:
-- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_BLHC: 'yes'
-  EXTRA_REPOSITORY: debian/salsa/extra_repository.list
-  EXTRA_REPOSITORY_KEY: debian/salsa/qt-kde-team.debian.net.asc
-  RELEASE: unstable
-  SALSA_CI_REPROTEST_ARGS: --variations=-build-path
diff -pruN 22.12.3-1/debian/upstream/metadata 22.12.3-0ubuntu1/debian/upstream/metadata
--- 22.12.3-1/debian/upstream/metadata	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-Bug-Database: https://bugs.kde.org/buglist.cgi?product=kmbox&resolution=---
-Bug-Submit: https://bugs.kde.org/enter_bug.cgi?product=kmbox
-Changelog: https://invent.kde.org/pim/kmbox/-/commits/master
-Donation: https://www.kde.org/community/donations/index.php
-Repository: https://invent.kde.org/pim/kmbox.git
-Repository-Browse: https://invent.kde.org/pim/kmbox
-Security-Contact: security@kde.org
diff -pruN 22.12.3-1/debian/upstream/signing-key.asc 22.12.3-0ubuntu1/debian/upstream/signing-key.asc
--- 22.12.3-1/debian/upstream/signing-key.asc	2022-12-20 00:37:27.000000000 +0000
+++ 22.12.3-0ubuntu1/debian/upstream/signing-key.asc	2023-03-02 00:40:11.000000000 +0000
@@ -1,5 +1,56 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
+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
+hC+sXh0NMOq4pxE=
+=Wqdv
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
 mQENBFlRpEYBCACecX3F5xzF6wzeXiuBAuHq74bVHON7I89U+ROloEWYUYMRNTz2
 l1BkNHWRTTqfmPO7LhMY6g4gOPeQVCwgTGVjI8bn6sJd3SFdeiRvvaFBpmn7SjBd
 s1rkKKJIjeMUl1w8dFnmf22V0PnhSSepmNwmd8RQnl1umCTSihDJydGxixw6ZNhr
@@ -104,37 +155,3 @@ wRVUGB63Jnn9afS3SYEBTAz/f4S6TAM30VL2To6H
 GMusAgSlrG55+BcCqtgEEF7/JbOUHbLUu8+g/F2rZpAbsr5V8g==
 =PVLg
 -----END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFfNZD4BEACo0YKCUEhTY7v8VZVw3csAtnsRSFQ18G8xfYIt7mJEBrtfiGG4
-g28EjNeWQfN8wGIaAeRGl5nb7s9RRpxXStUu719jGX1Z9Sr8p/JOmBS5kdfAtYId
-9Cl3VsGRvf4Smg1ClrEv6tQ97j+d1FY8QfgW/GS46YBOEeOFVQRtfi7Yv9lZkiBF
-rzP0Nr7JV9u1GkBsFgNkVuYs/3RDYULItBwGFerduOyQCOt819QvHHSZkXqJWwNR
-OA6lc8gW36lKbDHoZ1jSkDnDV0bW0cX1/6WJSzWYdcPiceA1vj/VDg0Kr23SVQ1P
-yPvBirT7ToirQm6KrIiKHWLSg156ht8/K2C1Dgypf+YMseMbHQxVLrI2p4zpmxu3
-B2SrSj3ImM5FO0XGd1gxn/qywNVJDQBfcYnndksD2i/9/Es8I/F6OymBZl4HWBvx
-7ixm2JPXkmwVPEC/lJn3eCBb1fAaJSlroHtaAEteCWuE5/Mg/uYEh1UeAstP47N3
-P0B3l1E4Ccw1ne2/O1BdsnXeUaI3YVYz9aZkVlL7ywda3h/goRKxc1b18bmgu/Ed
-QmcTEMj29B3szMpetWNt1ZbaMJzfDw+z+SiQ3toOTUiqMuWq+l+JK0dVUzOvpGhG
-VHv5m9CtJFP671ivEc4it0hJRH5kdW9aNbeG0g9TxHQqQMJIpeLvRq5WKwARAQAB
-iHUEEBYIAB0WIQRTIgRBURyuQ72pUgZ/g8L9hDZbOAUCW3p5ogAKCRB/g8L9hDZb
-OBsyAP9zp1VRowcJS9DKo3jMp1q857G36pnLrbTE3lt39FD3mgEA4vFkEWD130Be
-lBt/DqF4gOAYvjx2/vbXAVtdJuj8YgiIdQQQFgoAHRYhBOk/24GEriQcNFziNcIf
-+f3IeqlvBQJbcyVNAAoJEMIf+f3IeqlvY70A/Rw6pI//tE8uk59n1yTkCauMa1yk
-DwfZiUCpo62k6avWAP4466XrMwU7Ae7FGJ3tD2ujXCwGZuf42AoMx3R58s5fA7Qh
-QWxiZXJ0IEFzdGFscyBDaWQgPGFhY2lkQGtkZS5vcmc+iQJUBBMBCAA+AhsDBQsJ
-CAcCBhUICQoLAgQWAgMBAh4BAheAFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmEG
-Yw8FCQsqBFEACgkQOmpNuDnqptc5mw//a8E4zzOIIs6ve8KkUfz6RVdVAGOkplOJ
-9cnIIbopms265ceD0KSpqlLkgGONn/ROAvOe1xrJCw2SiELlc4Z/kM4nrwVaZvkn
-F3pJCAOTDBhJlqXeMSGLDDEDV5k/nUeIGanmj4wAfkvKzjBMJSaZau3BCB18v/mI
-0foEqIdUFFukoHNOu8mk4ZHRzdZqYu+f1waZR/tLGK71Dl916itsk+EbSir+XSdg
-SJgn63f1p0bL2DOPLjShgs+o6L/Hvy3Jdq5nlfbSUHfqT213Y1Ld5k0ChNDPcSZo
-F9mgFH9vUyE6G6gTWauH5EWiG/2HrDaaBQQQtXAPEUqElDpzfyPEoJriMgb6ezeA
-Swt1Hsyk8WXkbYHZvuti0oCowWpE39NIIXIYzZoT0h+MKMsvkJT/FsRa2b7FhnMi
-SNQjVbZdTVX+6SAzCxnS6Mb4fojXlWz3TFAq4uev3xPG5OVi5VdkvzO6sj2XVEoi
-U+9jG06sl6gcmhciBXerPG8XJeQILPyfD8+vHj2IFnrQD7ORMBBFTYddmAkvrKop
-suYACVTZqTDaxvih9VMgj7KFZAQXpylDMcS+IBSJIfGSOq1SQAER/KJlvKGKMmt5
-ego5oQcR73sPJdCuFzo+Ia/dr1PCM2tYTb1AMJ+hBRSPV1n7XOleel5pKNkBDzNh
-s2Ne6r9xAHQ=
-=rW7Y
------END PGP PUBLIC KEY BLOCK-----
