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

diff --cc debian/changelog
index d2cc20d04a4226461d93a4f3d3b29f56254c1573,af23b847d702f6c6627e123727145368319d208d..0631e961a846c6152722a83dfb48106d5868d01b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- libcec (4.0.4+dfsg1-2+rpi1) buster-staging; urgency=medium
++libcec (4.0.4+dfsg1-3+rpi1) bullseye-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>  Mon, 18 Mar 2019 13:16:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Sep 2019 02:14:35 +0000
++
+ libcec (4.0.4+dfsg1-3) unstable; urgency=medium
+ 
+   * debian/libcec4.symbols: Refresh symbols to build with GCC 9.
+     Thanks to Boyuan Yang for the proposed NMU (Closes: #925738)
+ 
+  -- Balint Reczey <rbalint@ubuntu.com>  Wed, 11 Sep 2019 00:16:56 +0200
  
  libcec (4.0.4+dfsg1-2) unstable; urgency=medium