Merge version 2022.2-3+rpi1 and 2022.4-1 to produce 2022.4-1+rpi1

diff --cc debian/changelog
index b42a46badcbb05974a40f0979e364d8e3d8de0bf,c748536b92950ec792db4293a5b3f2dc9d1f2d82..ddb784828c503f53ba9280b1c8e564af23e8fbb4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- ostree (2022.2-3+rpi1) bookworm-staging; urgency=medium
++ostree (2022.4-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>  Sun, 13 Mar 2022 02:46:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jun 2022 09:44:53 +0000
++
+ ostree (2022.4-1) unstable; urgency=medium
+ 
+   [ Dan Nicholson ]
+   * New upstream release
+     - Drop patches that were applied upstream
+   * d/control: Bump libglib2.0-dev dependency to 2.66.0
+   * Add new ostree-boot-complete.service unit to ostree-boot
+ 
+   [ Simon McVittie ]
+   * d/copyright: Update
+   * New upstream release
+   * d/libostree-1-1.symbols: Update
+   * d/p/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch:
+     Add patch to skip a test-case if /var/tmp doesn't support xattrs
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 17 Jun 2022 16:35:46 +0100
  
  ostree (2022.2-3) unstable; urgency=medium