Merge version 21.3.8-1+rpi1 and 22.0.5-1 to produce 22.0.5-1+rpi1

diff --cc debian/changelog
index 612ae08de62adf19ce62ded715f8561c42e46e53,6ab8e0725503a9db4d04278978ef4e794245f04c..bf3bb22e3908bb3770159601012dd8aa71ec341d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,55 +1,63 @@@
- mesa (21.3.8-1+rpi1) bookworm-staging; urgency=medium
++mesa (22.0.5-1+rpi1) bookworm-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>  Mon, 18 Apr 2022 15:05:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Jun 2022 13:43:03 +0000
++
+ mesa (22.0.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 02 Jun 2022 13:42:49 +0300
+ 
+ mesa (22.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 23 May 2022 14:48:48 +0300
+ 
+ mesa (22.0.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 May 2022 11:53:29 +0300
+ 
+ mesa (22.0.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 22 Apr 2022 08:50:14 +0300
+ 
+ mesa (22.0.1-2) experimental; urgency=medium
+ 
+   * Migrate to llvm-14.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 04 Apr 2022 12:40:09 +0300
+ 
+ mesa (22.0.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * rules: Disable lto as suggested by upstream.
+   * revert-enabling-tlsdesc-support.diff: Revert a commit that's causing
+     apps to crash. (LP: #1966221)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 30 Mar 2022 11:47:25 +0300
+ 
+ mesa (22.0.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Sun, 13 Mar 2022 20:46:36 +0200
+ 
+ mesa (22.0.0~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * path_max.diff: Refreshed.
+   * rules: Drop classic drivers (r100, r200, nouveau_vieux, i915, i965).
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 17 Feb 2022 22:04:03 +0200
  
  mesa (21.3.8-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge