Merge version 0.9.5-2+rpi1 and 0.9.5-3 to produce 0.9.5-3+rpi1

diff --cc debian/changelog
index a5a5907eb5a4af477298224ba860842c88f3191d,885ed2829feafc62e63af57eebc5e6fe38dcb61e..77583006d01fad1b87736c7e437f86f98c45d877
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- openorienteering-mapper (0.9.5-2+rpi1) bookworm-staging; urgency=medium
++openorienteering-mapper (0.9.5-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 0.7.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 13:33:40 +0000]
 +  * Use "debian" as "provider" for "licensing information".
 +
 +  [changes brought forward from 0.7.0-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 15 Mar 2018 01:08:30 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 03 Nov 2021 01:17:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jan 2022 02:36:31 +0000
++
+ openorienteering-mapper (0.9.5-3) unstable; urgency=medium
+ 
+   * Cherry-pick upstream commit updating expected
+     test failures with PROJ 8.2.0 (Closes: #998827)
+ 
+  -- Graham Inggs <ginggs@debian.org>  Tue, 28 Dec 2021 09:45:41 +0000
  
  openorienteering-mapper (0.9.5-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 4ac5ef014200ec23d1f5a1d6adb543b76d51746e,9c22e522140c94d50a26f2d80de1355b21eb457c..ce7718b29efeccb82631d1ff7381f2e782e77839
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,3 +1,4 @@@
  fix-help-data-dir.patch
  proj8.patch
+ proj8.2.0.patch
 +force-debian-license-info.patch