Merge version 1.7.0+ds-5+rpi1 and 1.7.0+ds-7 to produce 1.7.0+ds-7+rpi1

diff --cc debian/changelog
index db1cb3804111206f557b3651efe04b56ee9baa15,c67a2d6f5a5da2ec26a12048c2cbdd59f9ae8e4a..f93ed3fc85fef20a1935d4e01463be42e707d3bc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,27 @@@
- gpsbabel (1.7.0+ds-5+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.7.0+ds-7+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Aug 2020 02:57:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Oct 2020 19:33:18 +0000
++
+ gpsbabel (1.7.0+ds-7) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Remove qt5-default from build dependencies (Closes: #972164).
+     - Replace it with qtbase5-dev, which is the appropriate one.
+     - Export QT_SELECT := qt5 to let qtchooser use the right Qt version.
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sat, 17 Oct 2020 12:37:40 +0200
+ 
+ gpsbabel (1.7.0+ds-6) unstable; urgency=medium
+ 
+   * Set TZ for tests
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 13 Oct 2020 22:39:49 +0200
  
  gpsbabel (1.7.0+ds-5) unstable; urgency=medium
  

diff --cc debian/control
index f672f8ac2e596cdfb4975aee4913a0f6be6b3e66,dc0879352e5727be3395fa11af8696ec5f74ced9..d1c0af767e540a271f5a50a9967df8b77eeb826c
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,8 -9,8 +9,8 @@@ Build-Depends: debhelper-compat (= 13)
   libxml2-utils,
   libusb-1.0-0-dev, zlib1g-dev,
   libshp-dev,
-  qt5-default,
+  qtbase5-dev,
 - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
 + qtwebengine5-dev [amd64 arm64 i386 mipsel],
   qttools5-dev-tools,
   imagemagick,
   locales-all,