From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 23 Dec 2020 12:28:08 +0000 (+0000)
Subject: Merge version 20.2.4-1+rpi1 and 20.2.6-1 to produce 20.2.6-1+rpi1
X-Git-Tag: archive/raspbian/20.2.6-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc51479b342425f1ad714f33e01c352309678d0f;p=mesa.git

Merge version 20.2.4-1+rpi1 and 20.2.6-1 to produce 20.2.6-1+rpi1
---

bc51479b342425f1ad714f33e01c352309678d0f
diff --cc debian/changelog
index 43d76d87e,0ae2f60e1..05461aa30
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,22 @@@
- mesa (20.2.4-1+rpi1) bullseye-staging; urgency=medium
++mesa (20.2.6-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 12 Dec 2020 22:49:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 12:28:07 +0000
++
+ mesa (20.2.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 17 Dec 2020 06:42:32 +0200
+ 
+ mesa (20.2.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 16 Dec 2020 23:32:56 +0200
  
  mesa (20.2.4-1) unstable; urgency=medium