Merge version 4:20.08.3-1+rpi1 and 4:20.12.1-3 to produce 4:20.12.1-3+rpi1

diff --cc debian/changelog
index 1520a8927f94c3719db184811c3301c54d100b19,eead39e57016c06714161fc6c6b2463a16553589..7d97da415e9fbaddc5448d71039b00de6d31f2f9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,37 +1,44 @@@
- kaccounts-providers (4:20.08.3-1+rpi1) bullseye-staging; urgency=medium
++kaccounts-providers (4:20.12.1-3+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:20.08.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Aug 2020 13:42:41 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Nov 2020 00:08:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 21:43:55 +0000
++
+ kaccounts-providers (4:20.12.1-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Limit the qml-module-qtwebengine dependency only on the architectures
+     where it exists.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 16 Jan 2021 16:49:46 +0100
+ 
+ kaccounts-providers (4:20.12.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Adapt optional-qtwebengine.diff to actually work.
+   * Add the configuration for the CI on salsa.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 16 Jan 2021 16:06:28 +0100
+ 
+ kaccounts-providers (4:20.12.1-1) unstable; urgency=medium
+ 
+   * New upstream release (20.12.1).
+   * Refresh patch to make QtWebEngine optional.
+   * Update build dependencies according to the upstream build system:
+     - Qt >= 5.12
+     - KF5 >= 5.70
+   * Build depend on libkaccounts-dev >= 20.12 for the new
+     KAccountsUiPlugin::canceled signal.
+   * Add missing QML runtime dependencies.
+   * Refresh copyright information.
+   * Bump Standards-Version to 4.5.1, no change required.
+   * Refresh upstream metadata.
+   * Removed Maximiliano Curia from the uploaders, thanks for your work
+     on the package!
+   * Added myself to the uploaders.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 14 Jan 2021 21:21:43 +0100
  
  kaccounts-providers (4:20.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index 3623a82cd356b4b5dd787e1f6bfb4bc1e6c8702b,512c7d22c30cc0b679960c84aeb282f5bc9f78d1..e52cd2273b567ef02aa7f0234afd1bb795e73d62
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,17 -10,17 +10,17 @@@ Build-Depends: cmake (>= 3.5~)
                 gettext,
                 intltool,
                 libaccounts-glib-dev,
-                libkaccounts-dev (>= 4:20.04.0~),
-                libkf5declarative-dev (>= 5.4.0~),
-                libkf5i18n-dev (>= 5.4.0~),
-                libkf5kio-dev (>= 5.4.0~),
-                libkf5package-dev (>= 5.4.0~),
+                libkaccounts-dev (>= 4:20.12.0~),
+                libkf5declarative-dev (>= 5.70.0~),
+                libkf5i18n-dev (>= 5.70.0~),
+                libkf5kio-dev (>= 5.70.0~),
+                libkf5package-dev (>= 5.70.0~),
                 libsignon-qt5-dev,
                 pkg-kde-tools (>= 0.12),
-                qtbase5-dev (>= 5.2.0~),
-                qtdeclarative5-dev (>= 5.2.0~),
-                qtwebengine5-dev (>= 5.2.0~) [amd64 arm64 i386 mipsel],
- Standards-Version: 4.5.0
+                qtbase5-dev (>= 5.12.0~),
+                qtdeclarative5-dev (>= 5.12.0~),
 -               qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 i386 mipsel],
+ Standards-Version: 4.5.1
  Rules-Requires-Root: no
  Homepage: https://projects.kde.org/projects/kde/kdenetwork/kaccounts-providers
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kaccounts-providers