Merge version 4.0.4+dfsg1-1+rpi1 and 4.0.4+dfsg1-2 to produce 4.0.4+dfsg1-2+rpi1

diff --cc debian/changelog
index dd441331f9ee7879dd0909d6b0fbee03ab2486bb,28885f79984d5668dc8f80377968f076643ba439..d2cc20d04a4226461d93a4f3d3b29f56254c1573
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- libcec (4.0.4+dfsg1-1+rpi1) buster-staging; urgency=medium
++libcec (4.0.4+dfsg1-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.1.0+dfsg1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 10 Mar 2016 00:53:26 +0000]
 +  * Add symbols file hack for raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 4.0.3+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on libpython3 dev packages, if they are installed
 +    this package will pick them in preference to 2.7 resulting in
 +    missing files.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Feb 2019 02:12:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Mar 2019 13:16:14 +0000
++
+ libcec (4.0.4+dfsg1-2) unstable; urgency=medium
+ 
+   [ Balint Reczey ]
+   * Build-depend on pkg-kde-tools
+   * Update symbols file (Closes: #923904)
+ 
+  -- Balint Reczey <rbalint@ubuntu.com>  Fri, 08 Mar 2019 13:21:44 +0100
  
  libcec (4.0.4+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge