From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 12 Sep 2020 08:48:12 +0000 (+0100)
Subject: Merge version 3.2.1-25+rpi1 and 3.2.1-26 to produce 3.2.1-26+rpi1
X-Git-Tag: archive/raspbian/3.2.1-26+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ce7e418e26ed07ca9af92bd6c78e3e33932ac74;p=bumblebee.git

Merge version 3.2.1-25+rpi1 and 3.2.1-26 to produce 3.2.1-26+rpi1
---

1ce7e418e26ed07ca9af92bd6c78e3e33932ac74
diff --cc debian/changelog
index 81c22a3,9e516cd..114b23c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,21 @@@
- bumblebee (3.2.1-25+rpi1) bullseye-staging; urgency=medium
++bumblebee (3.2.1-26+rpi1) bullseye-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 22 Aug 2020 19:42:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 12 Sep 2020 08:48:11 +0000
++
+ bumblebee (3.2.1-26) unstable; urgency=medium
+ 
+   [ Andreas Beckmann ]
+   * bumblebee-nvidia: Activate the register-glx-alternative-nvidia trigger.
+   * bumblebee-nvidia: Do not let an nvidia dkms package satisfy the driver
+     dependency while libraries are missing.  (Closes: #966557)
+ 
+   [ Vincent Cheng ]
+   * Remove myself from Uploaders.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Sat, 22 Aug 2020 22:31:43 +0200
  
  bumblebee (3.2.1-25) unstable; urgency=medium