Manual merge of version 1.5.4-2+rpi1 and 1.6.0+ds-3 to produce 1.6.0+ds-3+rpi1

diff --cc debian/changelog
index 8241ab2ea6d344b12666ad5ea24d5ba6c458504e,d0d799df162b0948a363856557636bbd94ef8f17..02cb167bc793ed79e659d666d269a968ace2d4e7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,37 +1,47 @@@
- gpsbabel (1.5.4-2+rpi1) buster-staging; urgency=medium
++gpsbabel (1.6.0+ds-3+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.5.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 12:10:21 +0000]
 +  * Remove armhf from architecture list for qtwebengine build-dep, 
 +    we don't have (and may never have) it in Raspbian.
 +  * Remove armhf from architecture list for gpsbabel-gui, it
 +    needs the aforementioned build-dep.
-   * Try and fixup clean target in debian/rules it seems
-     that on systems where the gui can't be built the upstream
-     build process generates a broken gui/Makefile.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Oct 2017 12:10:21 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Sat, 27 Jul 2019 20:40:26 +0000
++
+ gpsbabel (1.6.0+ds-3) unstable; urgency=medium
+ 
+   * Build pdf on mips again as #580333 was fixed
+   * Ignore test results on some architectures
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 19 Jul 2019 14:08:44 +0200
+ 
+ gpsbabel (1.6.0+ds-2) unstable; urgency=medium
+ 
+   * Build doc in build-indep
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 19 Jul 2019 00:55:34 +0200
+ 
+ gpsbabel (1.6.0+ds-1) unstable; urgency=medium
+ 
+   [ Jochen Sprickerhof ]
+   * Cleanup upstream sources
+   * New upstream version (Closes: #805355)
+   * Fix debian/source/format
+   * Add watch file
+   * Rebase patches
+   * Add patches to use system libraries
+   * Port to dh 12 (Closes: #912089)
+   * Update copyright
+ 
+   [ Bernd Zeimetz ]
+   * Use gitlab-ci instead of travis
+   * Update Vcs-Git Urls.
+ 
+   [ Jochen Sprickerhof ]
+   * Maintainer set to team and add myself as uploader
+   * Bump policy version (no changes)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Thu, 18 Jul 2019 23:32:20 +0200
  
  gpsbabel (1.5.4-2) unstable; urgency=medium
  

diff --cc debian/control
index 9b35ae72dd78a773276d7b9dcb834ca6f74a0c1a,9747d1158e22f4712978583affe1710c2c94e89d..ed1738832acb9b833526ef09b713f320bdc22c6f
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -7,8 -8,9 +8,9 @@@ Build-Depends: debhelper-compat (= 12)
   libexpat1-dev, expat, help2man,
   libxml2-utils,
   libusb-dev, zlib1g-dev,
-  qtbase5-dev,
+  libshp-dev,
+  qt5-default,
 - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
 + qtwebengine5-dev [amd64 arm64 i386 mipsel],
   qttools5-dev-tools,
   imagemagick,
   locales-all