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

diff --cc debian/changelog
index a0ca839983eed275f3cf71f11f01d53aaf27c34c,fcffda6cb46687d2a9ff33c736210752f91b0ec8..ece3a6b0f62528f003fb537238edb5a4180aff19
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- openorienteering-mapper (0.8.4-1+rpi1) buster-staging; urgency=medium
++openorienteering-mapper (0.8.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>  Thu, 03 Jan 2019 00:56:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Sep 2019 01:25:16 +0000
++
+ openorienteering-mapper (0.8.4-2) unstable; urgency=medium
+ 
+   * Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility,
+     thanks Bas Couwenberg (Closes: #931935)
+   * Switch to debhelper 12
+   * Set Rules-Requires-Root: no
+   * Bump Standards-Version to 4.4.0, no changes
+ 
+  -- Graham Inggs <ginggs@debian.org>  Fri, 30 Aug 2019 13:35:14 +0000
  
  openorienteering-mapper (0.8.4-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge