From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 1 Sep 2020 12:15:53 +0000 (+0100)
Subject: Merge version 0~20150328-11+rpi1 and 0~20150328-12 to produce 0~20150328-12+rpi1
X-Git-Tag: raspbian/0_20150328-12+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc1371d9a1b9dc22532ac47e4c9bb03795653eea;p=primus.git

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

f1d273ecef66da11114668c2ba062b68f098b8dd
diff --cc debian/changelog
index 079c767,c7261c9..2908b2d
--- a/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