Merge version 22.0.5-1+rpi1 and 22.2.0~rc1-1 to produce 22.2.0~rc1-1+rpi1

diff --cc debian/changelog
index bf3bb22e3908bb3770159601012dd8aa71ec341d,88e5df722e79669718e9f36b8460e18f264c795e..3db03b16a0f5465c75af2fa466cc9f014a6ec9f0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,44 +1,52 @@@
- mesa (22.0.5-1+rpi1) bookworm-staging; urgency=medium
++mesa (22.2.0~rc1-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>  Sun, 12 Jun 2022 13:43:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Aug 2022 16:18:26 +0000
++
+ mesa (22.2.0~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate.
+   * revert-enabling-tlsdesc-support.diff: Dropped, obsolete.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 04 Aug 2022 10:33:09 +0300
+ 
+ mesa (22.1.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * control: Fix mesa-opencl-icd depends. (Closes: #1014840)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 04 Aug 2022 09:49:41 +0300
+ 
+ mesa (22.1.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 06 Jul 2022 09:00:49 +0300
+ 
+ mesa (22.1.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * mesa-vulkan-drivers.install: Fix installing layers.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 25 May 2022 15:10:32 +0300
+ 
+ mesa (22.1.0~rc5-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * rules: Fix enabling intel-nullhw, reorganize setting vulkan-layers.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 13 May 2022 12:09:18 +0300
+ 
+ mesa (22.1.0~rc3-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * rules: Clean all python build cruft.
+   * rules: Add intel-nullhw to vulkan confflags. (part of #1009027)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 03 May 2022 13:08:46 +0300
  
  mesa (22.0.5-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge