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

diff --cc debian/changelog
index 3767cdcda0fd3eec70fb33be51357ed1ae2717cb,ce3ebb0f43855bbbc00e974ea93ff42b069d2368..f1e1e5000ce3eca8e1437dc6a26e3c2957e59b7a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- openorienteering-mapper (0.9.4-2+rpi1) bullseye-staging; urgency=medium
++openorienteering-mapper (0.9.5-1+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>  Tue, 19 Jan 2021 23:34:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 30 Sep 2021 17:40:49 +0000
++
+ openorienteering-mapper (0.9.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Refresh fix-help-data-dir.patch
+   * Export XDG_RUNTIME_DIR for QSettings
+   * Update location of extra license file
+   * Bump Standards-Version to 4.6.0, no changes
+ 
+  -- Graham Inggs <ginggs@debian.org>  Sat, 25 Sep 2021 09:47:16 +0000
  
  openorienteering-mapper (0.9.4-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge