diff -pruN 3.0.5-1/debian/changelog 3.0.5-1ubuntu1/debian/changelog
--- 3.0.5-1/debian/changelog	2020-04-06 08:08:09.000000000 +0000
+++ 3.0.5-1ubuntu1/debian/changelog	2020-04-06 08:55:44.000000000 +0000
@@ -1,3 +1,10 @@
+libqapt (3.0.5-1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Recommend apt-xapian-index.
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 06 Apr 2020 09:55:44 +0100
+
 libqapt (3.0.5-1) unstable; urgency=medium
 
   * Team upload.
@@ -38,6 +45,41 @@ libqapt (3.0.4-1.1) unstable; urgency=me
 
  -- Julian Andres Klode <jak@debian.org>  Sun, 08 Mar 2020 15:33:23 +0100
 
+libqapt (3.0.4-1ubuntu5) focal; urgency=high
+
+  * Adapt to apt 1.9.11.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 27 Feb 2020 09:14:38 +0100
+
+libqapt (3.0.4-1ubuntu4) eoan; urgency=medium
+
+  * Import earlier upstream commit that fixes supportedUntil and happens
+    to fix some more apt 1.9 related failures.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 19 Jun 2019 12:42:25 +0200
+
+libqapt (3.0.4-1ubuntu3) eoan; urgency=medium
+
+  * Port to APT 1.9.0
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 19 Jun 2019 12:21:57 +0200
+
+libqapt (3.0.4-1ubuntu2) eoan; urgency=high
+
+  * No change rebuild against apt 1.9.0.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 17 Jun 2019 13:09:46 +0200
+
+libqapt (3.0.4-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from debian unstable. Remaining changes:
+    - debian/libqapt-dev.acc.in: pass -fno-keep-inline-functions to
+      gcc for acc test
+    - debian/control: recommends on apt-xapian-index
+    - debian/control: Kubuntu VCS fields
+
+ -- Rik Mills <rikmills@kubuntu.org>  Mon, 25 Jun 2018 06:22:15 +0100
+
 libqapt (3.0.4-1) unstable; urgency=medium
 
   * Team upload.
@@ -54,6 +96,32 @@ libqapt (3.0.4-1) unstable; urgency=medi
 
  -- Pino Toscano <pino@debian.org>  Fri, 27 Apr 2018 05:57:29 +0200
 
+libqapt (3.0.4-0ubuntu1) bionic; urgency=medium
+
+  * New upstream bugfix release (3.0.4)
+  * Drop upstream applied patch:
+    - upstream_not-check-status-file-for-timestamp.patch
+
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 20 Mar 2018 18:11:28 +0000
+
+libqapt (3.0.3-2ubuntu2) bionic; urgency=medium
+
+  * debian/patches: upstream_not-check-status-file-for-timestamp.patch
+    Upstream patch to prevent excessive update-apt-xapian-index index
+    rebuilds by Muon (LP: #1741767) & KDE Bug: 390476
+
+ -- Rik Mills <rikmills@kubuntu.org>  Mon, 26 Feb 2018 21:44:16 +0000
+
+libqapt (3.0.3-2ubuntu1) bionic; urgency=medium
+
+  * Merge with debian;remaining changes
+    - Pass '-fno-keep-inline-functions' to gcc in the acc test in order to
+      avoid possible spurious test failures.
+    - Keep kubuntu Vcs fields
+    - Recommends on apt-xapian-index
+
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 28 Dec 2017 09:22:31 +0000
+
 libqapt (3.0.3-2) unstable; urgency=medium
 
   * Team upload.
@@ -70,6 +138,16 @@ libqapt (3.0.3-2) unstable; urgency=medi
 
  -- Pino Toscano <pino@debian.org>  Sat, 23 Dec 2017 13:58:04 +0100
 
+libqapt (3.0.3-1ubuntu1) artful; urgency=medium
+
+  * Merge with debian;remaining changes
+    - Pass '-fno-keep-inline-functions' to gcc in the acc test in order to
+      avoid possible spurious test failures.
+    - Keep kubuntu Vcs fields
+    - Recommends on apt-xapian-index
+
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 22 Jun 2017 19:50:18 +0100
+
 libqapt (3.0.3-1) unstable; urgency=medium
 
   * Team upload.
@@ -104,6 +182,66 @@ libqapt (3.0.2-1) unstable; urgency=medi
 
  -- Pino Toscano <pino@debian.org>  Sun, 15 May 2016 17:05:58 +0200
 
+libqapt (3.0.3-0ubuntu1) zesty; urgency=medium
+
+  [ Rik Mills ]
+  * debian/patches: drop upstream_include-random-for-std-default_random_engine.patch
+    applied upstream.
+  * Update to new build depend name: kio-dev -> libkf5kio-dev
+  * New upstream bugfix release (3.0.3)
+    
+ -- Rik Mills <rikmills@kubuntu.org>  Thu, 06 Apr 2017 17:41:59 +0100
+
+libqapt (3.0.2-0ubuntu6) UNRELEASED; urgency=medium
+
+  * debian/patches: drop upstream_include-random-for-std-default_random_engine.patch
+    applied upstream.
+    
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 24 Mar 2017 16:24:06 +0000
+
+libqapt (3.0.2-0ubuntu5) zesty; urgency=medium
+
+  * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to
+    avoid possible spurious test failures.
+
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 24 Mar 2017 13:33:23 +0000
+
+libqapt (3.0.2-0ubuntu4) zesty; urgency=medium
+
+  * Rebuild against new libxapian30.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 01 Nov 2016 21:41:18 +0100
+
+libqapt (3.0.2-0ubuntu3) yakkety; urgency=medium
+
+  * libqapt3 should recommend apt-xapian-index for the package index
+    access which is required for most operations (LP: #1530523)
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Wed, 06 Jul 2016 09:43:26 +0000
+
+libqapt (3.0.2-0ubuntu2) yakkety; urgency=medium
+
+  * LP: #1597425. Fix build failure.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Jun 2016 18:05:00 +0200
+
+libqapt (3.0.2-0ubuntu1) xenial; urgency=medium
+
+  [ Clive Johnston ]
+  * New release 3.0.2, which adds extra functionality in Muon and prevent 
+    crashes due to no signals. Closes (LP: #1562406)
+
+  [ Scott Kitterman ]
+  * Update debian/libqapt3.symbols for 3.0.2 changes
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 16 Apr 2016 18:31:21 -0400
+
+libqapt (3.0.1-1build1) xenial; urgency=medium
+
+  * no change rebuild for libapt-pkg5.0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 01 Dec 2015 08:06:59 +0100
+
 libqapt (3.0.1-1) unstable; urgency=medium
 
   * New upstream release (3.0.1).
@@ -112,6 +250,19 @@ libqapt (3.0.1-1) unstable; urgency=medi
 
  -- Maximiliano Curia <maxy@debian.org>  Sat, 26 Sep 2015 08:13:16 +0200
 
+libqapt (3.0.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Update VCS to reflect move to Launchpad
+
+ -- Clive Johnston <clivejo@kubuntu.org>  Tue, 26 Jul 2016 22:41:23 +0100
+
+libqapt (3.0.1-0ubuntu1) wily; urgency=medium
+
+  * New upstream bugfix release.
+  * Drop all patches since all are upstreamed
+
+ -- Harald Sitter <sitter@kde.org>  Wed, 23 Sep 2015 12:29:49 +0200
+
 libqapt (3.0.0-6) unstable; urgency=medium
 
   * Add support for APT 1.1. (Closes: #798705) Thanks to Julian Andres Klode
@@ -124,6 +275,12 @@ libqapt (3.0.0-5) unstable; urgency=medi
 
  -- Maximiliano Curia <maxy@debian.org>  Tue, 01 Sep 2015 22:17:00 +0200
 
+libqapt (3.0.0-4ubuntu1) wily; urgency=medium
+
+  * Mark as optional a couple of symbols gone after building with gcc 5.
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Wed, 22 Jul 2015 13:42:24 +0200
+
 libqapt (3.0.0-4) unstable; urgency=medium
 
   * Team upload.
@@ -178,6 +335,22 @@ libqapt (3.0.0-1) experimental; urgency=
 
  -- Maximiliano Curia <maxy@debian.org>  Sat, 14 Feb 2015 09:28:30 +0100
 
+libqapt (3.0.0-0ubuntu2.2) vivid; urgency=medium
+
+  * Add upstream_cmake-configure-kf5iconthemes.diff to fix compile
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 28 Apr 2015 13:49:23 +0200
+
+libqapt (3.0.0-0ubuntu2.1) vivid; urgency=medium
+
+  * SRU two fixes LP: #1448929
+   - make sure that the changesdialog in muon apps shows the right
+    packages with the right states
+   - upstream_fix-heldness-state.diff
+   - upstream_exclude-broken-state-changes.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 27 Apr 2015 10:38:24 +0200
+
 libqapt (3.0.0-0ubuntu2) vivid; urgency=medium
 
   * Add build-dep on qttools5-dev-tools
diff -pruN 3.0.5-1/debian/control 3.0.5-1ubuntu1/debian/control
--- 3.0.5-1/debian/control	2020-04-06 08:01:35.000000000 +0000
+++ 3.0.5-1ubuntu1/debian/control	2020-04-06 08:55:44.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libqapt
 Section: kde
 Priority: optional
-Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Sune Vuorela <sune@debian.org>,
            Kai Wasserbäch <curan@debian.org>,
            Floris-Andrei Stoica-Marcu <floris.sm@gmail.com>,
@@ -43,7 +44,7 @@ Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqapt3-runtime (= ${binary:Version})
+Recommends: apt-xapian-index, libqapt3-runtime (= ${binary:Version})
 Description: QApt library package
  LibQApt is a Qt wrapper around the libapt-pkg library as well as an APT
  implementation using libapt-pkg. The aim is to provide a sane API for
