Merge version 20.2.3-1+rpi1 and 20.2.4-1 to produce 20.2.4-1+rpi1

diff --cc debian/changelog
index 59920a947acb3fc6d416c2aab9d58bc1a918fa51,c275287856d2d5733f5e5697985cbfbbfb9a5fba..43d76d87ef7d4f79c2711c0b57c8eac922f8b334
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- mesa (20.2.3-1+rpi1) bullseye-staging; urgency=medium
++mesa (20.2.4-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>  Tue, 01 Dec 2020 21:37:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 12 Dec 2020 22:49:24 +0000
++
+ mesa (20.2.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 07 Dec 2020 15:11:48 +0200
  
  mesa (20.2.3-1) unstable; urgency=medium