diff -Nru meta-kde-104ubuntu4/debian/changelog meta-kde-106ubuntu1/debian/changelog
--- meta-kde-104ubuntu4/debian/changelog	2020-02-08 11:07:14.000000000 +0000
+++ meta-kde-106ubuntu1/debian/changelog	2020-09-06 12:18:45.000000000 +0000
@@ -1,3 +1,44 @@
+meta-kde (5:106ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remove kio-perldoc from kdesdk as not built in Ubuntu.
+    - Restrict accountwizard, kaddressbook, knotes, konsolekalendar, parley,
+      and konqueror to architectures where QtWebEngine builds.
+    - Add muon package manager to kde-standard.
+
+ -- Rik Mills <rikmills@kde.org>  Sun, 06 Sep 2020 13:18:45 +0100
+
+meta-kde (5:106) unstable; urgency=medium
+
+  * Limit elisa to the release architectures on which it builds:
+    amd64 arm64 armel armhf i386 ppc64el s390x.
+  * Bump the minimum KDE Application version to 4:20.04.0.
+
+ -- Pino Toscano <pino@debian.org>  Thu, 06 Aug 2020 22:04:56 +0200
+
+meta-kde (5:105) unstable; urgency=medium
+
+  * Limit parley, and kimagemapeditor to the architectures where QtWebEngine
+    exists (amd64 arm64 armhf i386 mipsel), as they will use it soon.
+  * Add the configuration for the CI on salsa.
+  * Enable ksudoku, and kubrick also on armel, and armhf, as now they build on
+    these architectures too.
+  * Add elisa to kdemultimedia.
+  * Add knights to kdegames.
+  * Switch the debhelper build dependency to debhelper-compat
+    - remove debian/compat
+  * Bump the debhelper compatibility to 13:
+    - bump the debhelper-compat build dependency to 13
+  * Bump the minimum kdepim version to 4:20.04.1.
+  * Bump the minimum Plasma version to 4:5.17.5. (Closes: #948274)
+  * Bump the Calligra version to 1:3.2.0.
+  * Remove unused variables (used to be used for kdelibs 4.x metapackages)
+    in rules.
+  * Add Rules-Requires-Root: no.
+  * Bump Standards-Version to 4.5.0, no changes required.
+
+ -- Pino Toscano <pino@debian.org>  Sat, 01 Aug 2020 19:56:58 +0200
+
 meta-kde (5:104ubuntu4) focal; urgency=medium
 
   * No-change rebuild with fixed binutils on arm64.
diff -Nru meta-kde-104ubuntu4/debian/compat meta-kde-106ubuntu1/debian/compat
--- meta-kde-104ubuntu4/debian/compat	2019-08-26 06:13:08.000000000 +0000
+++ meta-kde-106ubuntu1/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-12
diff -Nru meta-kde-104ubuntu4/debian/control meta-kde-106ubuntu1/debian/control
--- meta-kde-104ubuntu4/debian/control	2020-01-09 17:49:39.000000000 +0000
+++ meta-kde-106ubuntu1/debian/control	2020-09-06 12:16:54.000000000 +0000
@@ -6,15 +6,16 @@
 Uploaders: Sune Vuorela <sune@debian.org>,
            Pino Toscano <pino@debian.org>,
            Maximiliano Curia <maxy@debian.org>
-Build-Depends: debhelper (>= 12)
-Standards-Version: 4.4.0
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Homepage: http://www.kde.org
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/meta-kde
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/meta-kde.git
 
 Package: kde-plasma-desktop
 Architecture: any
-Depends: kde-baseapps,
+Depends: kde-baseapps (>= ${kde:Version}),
          plasma-desktop (>= ${plasma:Version}),
          plasma-workspace (>= ${plasma:Version}),
          udisks2 [linux-any],
@@ -47,7 +48,6 @@
          khelpcenter (>= ${kde:Version}),
          kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
          knotes (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
-         kopete (>= ${kde:Version}),
          korganizer (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
          kwalletmanager (>= ${kde:Version}),
          muon,
@@ -61,7 +61,7 @@
          sweeper (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: konq-plugins (>= ${kde:Version}), plasma-nm (>= ${plasma:Version}) [linux-any]
-Suggests: skanlite
+Suggests: skanlite, kopete
 Breaks: kde-minimal (<< 5:57)
 Description: KDE Plasma Desktop and standard set of applications
  The KDE Software Compilation is the powerful, integrated, and easy-to-use Free
@@ -138,7 +138,7 @@
 Package: kde-baseapps
 Architecture: any
 Depends: dolphin (>= ${kde:Version}),
-         kdialog (>= ${kde:VersionNoEpoch}),
+         kdialog (>= ${kde:Version}),
          keditbookmarks (>= ${kde:VersionNoEpoch}),
          kfind (>= ${kde:Version}),
          konqueror (>= ${kde:Version}) [amd64 arm64 armhf i386 mipsel],
@@ -214,6 +214,7 @@
          kmines (>= ${kde:Version}),
          knavalbattle (>= ${kde:Version}),
          knetwalk (>= ${kde:Version}),
+         knights (>= ${kde:VersionNoEpoch}),
          kolf (>= ${kde:Version}),
          kollision (>= ${kde:Version}),
          konquest (>= ${kde:Version}),
@@ -224,9 +225,9 @@
          ksnakeduel (>= ${kde:Version}),
          kspaceduel (>= ${kde:Version}),
          ksquares (>= ${kde:Version}),
-         ksudoku (>= ${kde:Version}) [!armel !armhf],
+         ksudoku (>= ${kde:Version}),
          ktuberling (>= ${kde:Version}),
-         kubrick (>= ${kde:Version}) [amd64 i386],
+         kubrick (>= ${kde:Version}),
          lskat (>= ${kde:Version}),
          palapeli (>= ${kde:Version}),
          picmi (>= ${kde:Version}),
@@ -271,6 +272,7 @@
 Package: kdemultimedia
 Architecture: any
 Depends: dragonplayer (>= ${kde:Version}),
+         elisa (>= ${kde:VersionNoEpoch}) [amd64 arm64 armel armhf i386 ppc64el s390x],
          juk (>= ${kde:Version}),
          kde-config-cddb (>= ${kde:Version}),
          kio-audiocd (>= ${kde:Version}),
@@ -293,12 +295,11 @@
 Package: kdenetwork
 Architecture: any
 Depends: kget (>= ${kde:Version}),
-         kopete (>= ${kde:Version}) [linux-any],
          krdc (>= ${kde:Version}),
          krfb (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: kdenetwork-filesharing (>= ${kde:Version})
-Suggests: kde-zeroconf
+Suggests: kde-zeroconf, kopete
 Description: networking applications from the official KDE release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -405,7 +406,7 @@
 
 Package: kdewebdev
 Architecture: any
-Depends: kimagemapeditor (>= ${kde:Version}) [amd64 arm64 armhf],
+Depends: kimagemapeditor (>= ${kde:Version}) [amd64 arm64 armhf i386 mipsel],
          ${misc:Depends}
 Description: web development apps from the official KDE release
  This metapackage includes a collection of web development applications
diff -Nru meta-kde-104ubuntu4/debian/rules meta-kde-106ubuntu1/debian/rules
--- meta-kde-104ubuntu4/debian/rules	2019-08-26 06:12:55.000000000 +0000
+++ meta-kde-106ubuntu1/debian/rules	2020-09-06 12:05:37.000000000 +0000
@@ -2,21 +2,17 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
-MINIMUM_KDE_VERSION := 4:17.08.3
+MINIMUM_KDE_VERSION := 4:20.04.0
 MINIMUM_KDE_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_KDE_VERSION)))
-MINIMUM_KDEPIM_VERSION := 4:17.08.3
-MINIMUM_PLASMA_VERSION := 4:5.10
+MINIMUM_KDEPIM_VERSION := 4:20.04.1
+MINIMUM_PLASMA_VERSION := 4:5.17.5
 MINIMUM_PLASMA_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_PLASMA_VERSION)))
 
-CALLIGRA_VERSION := 1:3.0.1
-DEV_LATEST_VERSION := 4:4.12
-DEV_WORKSPACE_VERSION := 4:4.11.6
-DEV_PREV_VERSION := 4:4.11.3
+CALLIGRA_VERSION := 1:3.2.0
 
 KDE_VERSION_METAPKGS := kde-baseapps kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdesdk kdetoys kdeutils kdewebdev
 
 BINARY_VERSION_NO_EPOCH := $(subst :,.,$(DEB_VERSION))
-DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)
 METAPKGS_PACKAGE_VERSION := $(MINIMUM_KDE_VERSION)+$(BINARY_VERSION_NO_EPOCH)
 
 override_dh_gencontrol:
diff -Nru meta-kde-104ubuntu4/debian/salsa-ci.yml meta-kde-106ubuntu1/debian/salsa-ci.yml
--- meta-kde-104ubuntu4/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ meta-kde-106ubuntu1/debian/salsa-ci.yml	2020-08-06 20:04:56.000000000 +0000
@@ -0,0 +1,6 @@
+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_MISSING_BREAKS: 'no'
+  SALSA_CI_DISABLE_RC_BUGS: 'no'