Merge version 0~20150328-11+rpi1 and 0~20150328-12 to produce 0~20150328-12+rpi1

diff --cc debian/changelog
index 079c767a441063e2413e22479bfee33871dc8108,c7261c9461fde9279890eec49d656be9e343c059..2908b2d2c5acef6be10d2a7f61fb723c5bfff785
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- primus (0~20150328-11+rpi1) bullseye-staging; urgency=medium
++primus (0~20150328-12+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 0~20150328-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 20 Jun 2020 02:48:48 +0000]
 +  * Disable primus-nvidia package.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 20 Jun 2020 02:48:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 12:15:53 +0000
++
+ primus (0~20150328-12) unstable; urgency=medium
+ 
+   * primus-nvidia: Build for arm64.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Thu, 23 Jul 2020 23:15:02 +0200
  
  primus (0~20150328-11) unstable; urgency=medium