Merge version 20.3.4-1+rpi1 and 20.3.5-1 to produce 20.3.5-1+rpi1

diff --cc debian/changelog
index 49a4931b3630460d79a4c7e7eae41517edb94bfe,b97465f69a541ac3b5ef33fe522a25bf728cf7c3..aa08b3b3039a9c5a559d88fc4e88b863adc1ca21
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- mesa (20.3.4-1+rpi1) bullseye-staging; urgency=medium
++mesa (20.3.5-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 20.1.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 02 Jul 2020 00:56:02 +0000]
 +  * Don't build with valgrind on armhf, the old version in Raspbian
 +    is not compatible.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 08 Feb 2021 02:38:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Aug 2021 01:42:56 +0000
++
+ mesa (20.3.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Mar 2021 12:11:46 +0200
  
  mesa (20.3.4-1) unstable; urgency=medium