Merge version 2.4.97-1+rpi1 and 2.4.99-1 to produce 2.4.99-1+rpi1

diff --cc debian/changelog
index 92f3f83253a5befc7b73b83a803008e014a614d0,55cb340061efe300ec4775ad16f41276bda19249..3a513d5438738f11735b48c02990bf2cfa53d4d3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- libdrm (2.4.97-1+rpi1) buster-staging; urgency=medium
++libdrm (2.4.99-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.4.74-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 28 Jun 2017 21:14:42 +0000]
 +  * Move valgrind to build-conflicts, the old version in raspbian breaks the build.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Feb 2019 14:12:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Aug 2019 16:14:59 +0000
++
+ libdrm (2.4.99-1) unstable; urgency=medium
+ 
+   * New upstream release. (Closes: #934494)
+   * 02_kfreebsd.diff: Dropped, upstream.
+   * symbols: Updated.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 12 Aug 2019 12:01:03 +0300
  
  libdrm (2.4.97-1) unstable; urgency=medium