Merge version 2.4.107-2+rpi1 and 2.4.107-8 to produce 2.4.107-8+rpi1

diff --cc debian/changelog
index 343d00853135780989c280e9e42245321320cec8,62314d4bfa3c4b2dcb6dcf0842f63c2238c5176c..ff5970614ddb47db1708533abeb658f39c70b89c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,47 @@@
- libdrm (2.4.107-2+rpi1) bookworm-staging; urgency=medium
++libdrm (2.4.107-8+rpi1) bookworm-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, 26 Aug 2021 11:45:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Oct 2021 16:12:32 +0000
++
+ libdrm (2.4.107-8) unstable; urgency=medium
+ 
+   * rules: Forcibly disable valgrind.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 27 Sep 2021 20:10:39 +0300
+ 
+ libdrm (2.4.107-7) unstable; urgency=medium
+ 
+   * Drop valgrind support, it's not ready for multi-arch. (Closes:
+     #994955)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 27 Sep 2021 14:36:51 +0300
+ 
+ libdrm (2.4.107-6) unstable; urgency=medium
+ 
+   * control: Fix valgrind dependency archs for libdrm-dev.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 23 Sep 2021 14:09:08 +0300
+ 
+ libdrm (2.4.107-5) unstable; urgency=medium
+ 
+   * control: Add valgrind to libdrm-dev Depends. (Closes: #994873)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 23 Sep 2021 05:26:53 +0300
+ 
+ libdrm (2.4.107-4) unstable; urgency=medium
+ 
+   * control: Add libpciaccess-dev to -dev Depends, required by
+     libdrm_intel.pc.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 22 Sep 2021 11:51:51 +0300
+ 
+ libdrm (2.4.107-3) unstable; urgency=medium
+ 
+   * Include static libs in -dev again. (LP: #1944107)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 21 Sep 2021 16:52:54 +0300
  
  libdrm (2.4.107-2) unstable; urgency=medium
  

diff --cc debian/control
index 9d24e416a074053eddffd3cbaa92a485b05c02c4,1a079822f836f3bcc219163431b4a624d0fd106a..1748669235d566a015385f60245047718ff733f3
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,8 -14,7 +14,9 @@@ Build-Depends
   libudev-dev [linux-any],
   libpciaccess-dev,
   python3-docutils,
+ # valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
 +Build-conflicts:
 + Valgrind
  Standards-Version: 4.5.0
  Section: libs
  Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm