Merge version 2.4.116-1+rpi1 and 2.4.117-1 to produce 2.4.117-1+rpi1

diff --cc debian/changelog
index 03cb603201239720a416f51164eb55ddb04bd625,409b49b0fb58cbfc3d2df7926d284ebe64e1904e..9fcb2ee4ee003f06e21f04098ef70071dd236cf6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- libdrm (2.4.116-1+rpi1) trixie-staging; urgency=medium
++libdrm (2.4.117-1+rpi1) trixie-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 Oct 2023 22:59:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Nov 2023 23:30:20 +0000
++
+ libdrm (2.4.117-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * symbols: Updated.
+   * control, rules: Drop kfreebsd.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 02 Nov 2023 15:55:11 +0200
  
  libdrm (2.4.116-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge