Merge version 2022.4-2+rpi1 and 2022.5-1 to produce 2022.5-1+rpi1

diff --cc debian/changelog
index b22e8dcbe586d18060f180f9ce9822320f09dc68,762a4e6baff76dea9149c243ceced4dd81dbc0ad..a97961c52163089468c730cf44d9052ccb8a3c95
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- ostree (2022.4-2+rpi1) bookworm-staging; urgency=medium
++ostree (2022.5-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2020.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Dec 2020 11:54:45 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Jun 2022 09:17:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Aug 2022 13:42:35 +0000
++
+ ostree (2022.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * debian/libostree-1-1.symbols: Update
+   * d/copyright: Update
+   * Drop patches that were applied upstream
+   * Update Lintian overrides
+   * Standards-Version: 4.6.1 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 26 Jul 2022 19:00:58 +0100
  
  ostree (2022.4-2) unstable; urgency=medium