Merge version 5:104+rpi3 and 5:106 to produce 5:106+rpi1

diff --cc debian/changelog
index 4a4fa345de46b1ee4f44b0e0f27607d16376b48a,5dba531309d66a6d6041cd07531fd9afa9da2542..ff0ddc01098be8bfb62d3cd88608b9790ba42c25
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,33 +1,51 @@@
- meta-kde (5:104+rpi3) bullseye-staging; urgency=medium
- 
-   * Reinstate kig, package is now fixed.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 28 Jun 2020 17:18:28 +0000
- 
- meta-kde (5:104+rpi2) bullseye-staging; urgency=medium
- 
-   * Drop kig for now as it depends on boost 1.67
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Jun 2020 23:55:11 +0000
- 
- meta-kde (5:104+rpi1) bullseye-staging; urgency=medium
++meta-kde (5:106+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5:93+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Dec 2017 04:35:56 +0000]
 +  * Remove armhf from arch list for kalgebra dependency, sadly we don't
 +    currently have the full kalgebra in Raspbian due to webengine.
 +
 +  [changes brought forward from 5:98+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 07:36:26 +0000]
 +  * Align dependencies for armhf to those for armel as we don't currently have
 +    qtwebengine in Raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Sep 2019 17:12:55 +0000
++  [changes brought forward from 5:104+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Jun 2020 23:55:11 +0000]
++  * Drop kig for now as it depends on boost 1.67
++
++  [changes brought forward from 5:104+rpi3 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jun 2020 17:18:28 +0000]
++  * Reinstate kig, package is now fixed.
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Aug 2020 16:59:06 +0000
++
+ 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:104) unstable; urgency=medium
  

diff --cc debian/control
Simple merge