Manual merge of version 0.7.0-1+rpi2 and 0.8.1.1-1 to produce 0.8.1.1-1+rpi1

diff --cc debian/changelog
index e55360e00ff229ba26c8c04bb3ccbad9699fd35a,b9e2e65a97cefd641744a42fc629229532c73a48..5f866bbd9562e466fe50b6c806316281e0dbacc7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,20 +1,30 @@@
- openorienteering-mapper (0.7.0-1+rpi2) buster-staging; urgency=medium
++openorienteering-mapper (0.8.1.1-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, 15 Mar 2018 01:08:30 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Apr 2018 16:31:54 +0000
 +
- openorienteering-mapper (0.7.0-1+rpi1) buster-staging; urgency=medium
+ openorienteering-mapper (0.8.1.1-1) unstable; urgency=medium
  
-   * Use "debian" as "provider" for "licensing information".
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Oct 2017 13:33:40 +0000
+   [ Gaudenz Steinlin ]
+   * New upstream release
+     - Fix build on big-endian systems (Closes: #865180)
+     - Fix reproducible builds (Closes: #876934)
+     - Update for PROJ5
+   * Change VCS URLs to salsa.debian.org
+   * Document updating to a new upstream release
+ 
+   [ Graham Inggs ]
+   * Add Build-Depends on sqlite3
+   * Switch to debhelper compat level 11
+   * Skip tests when DEB_BUILD_OPTIONS=nocheck
+   * Bump Standards-Version to 4.1.3, no changes
+ 
+  -- Graham Inggs <ginggs@debian.org>  Thu, 29 Mar 2018 13:49:31 +0000
  
  openorienteering-mapper (0.7.0-1) unstable; urgency=medium
  

diff --cc debian/rules
index 6f5a5a105e8e87444985d5246d40e813479ec379,f1e73000138d3e5748003a48f5952deed699bd09..ec0088a55348145a875e7d64c02b0fc52af76ec4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -44,6 -44,8 +44,9 @@@ override_dh_auto_install
        /usr/bin/chrpath -d $(PKGDIR)/usr/bin/Mapper
  
  override_dh_auto_test:
+ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        # The tests need a running X server, so use Xvfb to run the tests in automated
        # build environments.
 -      cd obj-$(DEB_HOST_GNU_TYPE) ; xvfb-run /usr/bin/ctest --force-new-ctest-process -j1 --extra-verbose
 +      #cd obj-$(DEB_HOST_GNU_TYPE) ; xvfb-run /usr/bin/ctest --force-new-ctest-process -j1 --extra-verbose
+ endif
++