Merge version 1.0.1+dfsg1-3+rpi1 and 1.0.1+dfsg1-4 to produce 1.0.1+dfsg1-4+rpi1

diff --cc debian/changelog
index 067ded5f50910fac9d5e2f4c2122a00369367dbc,ef69a1f4f83a72d660568fa98825a8f90dd0ff00..550a549f62dcb76c884ef6b37549e66f3d5c268e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,29 +1,36 @@@
- gpac (1.0.1+dfsg1-3+rpi1) bullseye-staging; urgency=medium
++gpac (1.0.1+dfsg1-4+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.0.1+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:28:54 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 08 May 2021 12:28:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jun 2021 22:48:46 +0000
++
+ gpac (1.0.1+dfsg1-4) unstable; urgency=medium
+ 
+   [ Moritz Muehlenhoff ]
+   * Cherrypicked fixes for multiple security issues:
+     (Closes: #987280, #987323, #987374)
+     - CVE-2021-30014/CVE-2021-30020/CVE-2021-30022
+     - CVE-2020-35979
+     - CVE-2020-35981
+     - CVE-2020-35982
+     - CVE-2021-28300
+     - CVE-2021-29279
+     - CVE-2021-31255
+     - CVE-2021-31256
+     - CVE-2021-31261
+     - CVE-2021-30015
+     - CVE-2021-30019
+     - CVE-2021-30199
+     - CVE-2021-31257
+     - CVE-2021-31258
+     - CVE-2021-31260
+     - CVE-2021-31262
+ 
+   [ Reinhard Tartler ]
+   * upload to unstable
+ 
+  -- Reinhard Tartler <siretart@tauware.de>  Mon, 24 May 2021 21:09:10 -0400
  
  gpac (1.0.1+dfsg1-3) unstable; urgency=medium