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

diff --cc debian/changelog
index f1e1e5000ce3eca8e1437dc6a26e3c2957e59b7a,315ea5b6ebb8dabf121ec573023b5ccde87bbf84..a5a5907eb5a4af477298224ba860842c88f3191d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- openorienteering-mapper (0.9.5-1+rpi1) bookworm-staging; urgency=medium
++openorienteering-mapper (0.9.5-2+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>  Thu, 30 Sep 2021 17:40:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 03 Nov 2021 01:17:23 +0000
++
+ openorienteering-mapper (0.9.5-2) unstable; urgency=medium
+ 
+   [ Bas Couwenberg ]
+   * Add patch to fix FTBFS with PROJ 8.
+     (closes: #983254)
+ 
+  -- Graham Inggs <ginggs@debian.org>  Sun, 24 Oct 2021 08:00:58 +0000
  
  openorienteering-mapper (0.9.5-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 432ab1b3aad1857bf75bc8f182fcf1b16af25c2f,474903da3fe9de05e74540b555ea709457ba1942..4ac5ef014200ec23d1f5a1d6adb543b76d51746e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
  fix-help-data-dir.patch
+ proj8.patch
 +force-debian-license-info.patch