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

diff --cc debian/changelog
index 3910174cc5913ce63050657fc391e82f081fbf6e,796dcdfd2fae4d8117836045265c07d744847aab..3767cdcda0fd3eec70fb33be51357ed1ae2717cb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,23 @@@
- openorienteering-mapper (0.9.4-1+rpi1) bullseye-staging; urgency=medium
++openorienteering-mapper (0.9.4-2+rpi1) bullseye-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, 27 Oct 2020 20:47:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Jan 2021 23:34:01 +0000
++
+ openorienteering-mapper (0.9.4-2) unstable; urgency=medium
+ 
+   [ Vagrant Cascadian ]
+   * debian/rules: Disable fixfilepath feature, as it triggers
+     build failures when enabled, see #972294
+ 
+   [ Graham Inggs ]
+   * Bump Standards-Version to 4.5.1, no changes
+ 
+  -- Graham Inggs <ginggs@debian.org>  Mon, 11 Jan 2021 10:50:08 +0000
  
  openorienteering-mapper (0.9.4-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge