From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 2 Aug 2020 10:22:02 +0000 (+0100)
Subject: Merge version 20.1.2-1+rpi1 and 20.1.4-1 to produce 20.1.4-1+rpi1
X-Git-Tag: raspbian/20.1.4-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ecf3da90338ca6cddc91e4f4043fedca8d1a24d;p=mesa.git

Merge version 20.1.2-1+rpi1 and 20.1.4-1 to produce 20.1.4-1+rpi1
---

0215451cb4367bc799d5cc40c71253e02fad8e7d
diff --cc debian/changelog
index 78220e54b,eef64465a..2d62155fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,17 @@@
- mesa (20.1.2-1+rpi1) bullseye-staging; urgency=medium
++mesa (20.1.4-1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 20.1.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 02 Jul 2020 00:56:02 +0000]
 +  * Don't build with valgrind on armhf, the old version in Raspbian
 +    is not compatible.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 02 Jul 2020 00:56:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 02 Aug 2020 10:22:01 +0000
++
+ mesa (20.1.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * fix-ppc64el.patch: Dropped, upstream.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 28 Jul 2020 15:59:19 +0300
  
  mesa (20.1.2-1) unstable; urgency=medium