Merge version 7:4.4-5+rpi1 and 7:4.4-6 to produce 7:4.4-6+rpi1

diff --cc debian/changelog
index 94e107ca509bf953a434b6880464595644328679,f814fc371e6668d25c11537d690e915988317e16..ec5b100e1b5e89e44fd6502643922efa4b8b1522
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,16 @@@
- ffmpeg (7:4.4-5+rpi1) bookworm-staging; urgency=medium
++ffmpeg (7:4.4-6+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 7:4.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 05 Sep 2021 20:59:14 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 05 Sep 2021 20:59:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Sep 2021 15:40:00 +0000
++
+ ffmpeg (7:4.4-6) unstable; urgency=medium
+ 
+   * debian/*.symbols: Bump version of symbols to match upstream release
+   * debian/ffmpeg.maintscript: Drop removal of old conffile
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 09 Sep 2021 22:45:41 +0200
  
  ffmpeg (7:4.4-5) unstable; urgency=medium