Merge version 3.2.1-30+rpi1 and 3.2.1-31 to produce 3.2.1-31+rpi1

diff --cc debian/changelog
index 588a90328ba95456cb4b0c7d4092639f343f26d8,ac4a254933a1dcea5b729deeba56cb1f53e4a8af..e98b0063b824a52e908858f0ba178199f280db42
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- bumblebee (3.2.1-30+rpi1) trixie-staging; urgency=medium
++bumblebee (3.2.1-31+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 3.2.1-25+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 22 Aug 2020 19:42:31 +0000]
 +  * Disable bumblebee-nvidia package.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2024 10:22:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Nov 2024 16:52:10 +0000
++
+ bumblebee (3.2.1-31) unstable; urgency=medium
+ 
+   * Update the list of supported drivers.
+   * Switch B-D: pkg-config to pkgconf.
+   * Drop support for upgrading to bullseye (EoL).
+   * Bump Standards-Version to 4.7.0, no changes needed.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Thu, 14 Nov 2024 00:04:09 +0100
  
  bumblebee (3.2.1-30) unstable; urgency=medium
  

diff --cc debian/control
Simple merge