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

diff --cc debian/changelog
index bab220ac00fa7c8cc49d25b09a19b93c1750553a,94a75427ed7ab3b1e3b4e0a2877a67b7779157b4..92f3f83253a5befc7b73b83a803008e014a614d0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- libdrm (2.4.95-1+rpi1) buster-staging; urgency=medium
++libdrm (2.4.97-1+rpi1) buster-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>  Mon, 15 Oct 2018 23:12:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Feb 2019 14:12:01 +0000
++
+ libdrm (2.4.97-1) unstable; urgency=medium
+ 
+   [ Andreas Boll ]
+   * New upstream release.
+   * Update libdrm-amdgpu1.symbols and shlibs.
+   * Update libdrm-freedreno1.symbols and shlibs.
+ 
+   [ James Clarke ]
+   * Fix build on GNU/kFreeBSD (Closes: #837034, #909249).
+   * Remove no longer needed build-dep libbsd-overlay.
+ 
+  -- Andreas Boll <aboll@debian.org>  Wed, 23 Jan 2019 12:45:04 +0100
  
  libdrm (2.4.95-1) unstable; urgency=medium
  

diff --cc debian/control
index d7fe16e56a3ada05a0b6dce39532a4678e52a157,80aa19f5284f6246b83aee4fc67a5c57b9bf3b85..53d3789d73779a623fbcace2e148a216ae982b9c
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,9 -13,7 +13,8 @@@ Build-Depends
   xutils-dev (>= 1:7.6+2),
   libudev-dev [linux-any],
   libpciaccess-dev,
-  libbsd-dev [kfreebsd-any],
 - valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
 +Build-conflicts:
 + Valgrind
  Standards-Version: 4.1.4
  Section: libs
  Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm