Merge version 0.8.1.1-1+rpi1 and 0.8.4-1 to produce 0.8.4-1+rpi1

diff --cc debian/changelog
index 5f866bbd9562e466fe50b6c806316281e0dbacc7,6872ba3e11237f451a9bc47bda0ff09010096c90..a0ca839983eed275f3cf71f11f01d53aaf27c34c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,21 @@@
- openorienteering-mapper (0.8.1.1-1+rpi1) buster-staging; urgency=medium
++openorienteering-mapper (0.8.4-1+rpi1) buster-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Apr 2018 16:31:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Jan 2019 00:56:51 +0000
++
+ openorienteering-mapper (0.8.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Refresh fix-help-data-dir.patch
+   * Update debian/watch to ignore preview snapshots
+   * Bump Standards-Version to 4.3.0, no changes
+ 
+  -- Graham Inggs <ginggs@debian.org>  Tue, 25 Dec 2018 11:21:02 +0000
  
  openorienteering-mapper (0.8.1.1-1) unstable; urgency=medium
  

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