Merge version 4:17.12.3-1+rpi1 and 4:17.12.3-2 to produce 4:17.12.3-2+rpi1

diff --cc debian/changelog
index a3b14d07ab4fd2b99a6ae56bd952905447702e56,c7f1f62193ec3316b54d3529fe1e891715aa54e4..93d9863694140af38357eed8863cacfb22219d95
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- korganizer (4:17.12.3-1+rpi1) buster-staging; urgency=medium
++korganizer (4:17.12.3-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 08:48:57 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 06:58:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 15 Sep 2018 11:54:34 +0000
++
+ korganizer (4:17.12.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Backport upstream commit 9592053caa790eec669c08266f403b40746296b2 to fix
+     build with Qt 5.11; patch upstream_Add-missing-include.patch.
+   * Bump Standards-Version to 4.1.5, no changes required.
+   * Remove empty line at the end of changelog.
+   * Update lintian overrides.
+ 
+  -- Pino Toscano <pino@debian.org>  Tue, 31 Jul 2018 22:37:17 +0200
  
  korganizer (4:17.12.3-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge