Merge version 0.8.4-2+rpi1 and 0.9.1-1 to produce 0.9.1-1+rpi1

diff --cc debian/changelog
index ece3a6b0f62528f003fb537238edb5a4180aff19,76a5e43fb788e2b12d84c183ec3ddb16a009a478..4f5412826324c88687776039215c745ba045e637
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,24 @@@
- openorienteering-mapper (0.8.4-2+rpi1) bullseye-staging; urgency=medium
++openorienteering-mapper (0.9.1-1+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>  Sat, 07 Sep 2019 01:25:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Dec 2019 02:06:56 +0000
++
+ openorienteering-mapper (0.9.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update debian/watch to ignore pre-release versions
+   * Refresh fix-help-data-dir.patch
+   * Do not define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H, no longer needed
+   * Update debian/copyright
+   * Bump Standards-Version to 4.4.1, no changes
+   * Add build dependency on qt5-image-formats-plugins
+ 
+  -- Graham Inggs <ginggs@debian.org>  Mon, 16 Dec 2019 07:41:29 +0000
  
  openorienteering-mapper (0.8.4-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge

diff --cc doc/licensing/CMakeLists.txt
Simple merge