Merge version 2022.6-1+rpi1 and 2022.7-2 to produce 2022.7-2+rpi1

diff --cc debian/changelog
index a7b291f6f3ba7a892870c696eabc2abe14573a83,405c52e66db5f1efd0bc22861b3e014640b257e7..542b9ad91ccec4dab833286ecbbb2d8b3c737f83
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- ostree (2022.6-1+rpi1) bookworm-staging; urgency=medium
++ostree (2022.7-2+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, 19 Oct 2022 01:56:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Dec 2022 16:34:08 +0000
++
+ ostree (2022.7-2) unstable; urgency=medium
+ 
+   * Skip test-sysroot.js on s390x (Mitigates: #1025532)
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 06 Dec 2022 11:11:05 +0000
+ 
+ ostree (2022.7-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * d/copyright: Update
+   * d/libostree-1-1.symbols: Update
+   * Update Lintian overrides
+   * d/p/configure-use-pkg-config-with-newer-gpgme-and-gpg-error.patch:
+     Add patch from Luca Bruno to fix FTBFS with current gpgme Debian packages
+   * d/rules: Update for removal of libreaddir-rand.so LD_PRELOAD module
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 25 Nov 2022 10:54:28 +0000
  
  ostree (2022.6-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge