Merge version 0.19.0+ds-5+rpi1 and 0.20.0+ds-1 to produce 0.20.0+ds-1+rpi1

diff --cc debian/changelog
index 128b15f4c22de01727c9cd68dc4f9afc7240cb48,0cabfe75432e5d5fd3cba1bf58da9e795a4a9c4d..f2c2cb63667c45654b1ad001cef826e53b76183e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- merkaartor (0.19.0+ds-5+rpi1) trixie-staging; urgency=medium
++merkaartor (0.20.0+ds-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 0.19.0+ds-2+rpi1 by root <Peter Michael Green <plugwash@raspbian.org> at Tue, 14 Sep 2021 15:50:33 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 25 Jun 2024 16:02:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 29 Sep 2024 10:18:16 +0000
++
+ merkaartor (0.20.0+ds-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Bump Standards-Version to 4.7.0, no changes.
+   * Drop patches applied upstream.
+   * Update copyright file.
+   * Add protobuf build dependencies.
+   * Add libqt5networkauth5-dev build dependency for OAuth2 support.
+ 
+  -- Bas Couwenberg <sebastic@debian.org>  Sun, 08 Sep 2024 06:20:04 +0200
  
  merkaartor (0.19.0+ds-5) unstable; urgency=medium
  

diff --cc debian/control
index 1b40798b1d902c9218e333e0e5c0a40008602c29,8940d714aa59bee504ffa901063b217a0ed417ba..be461389ff554efecf93a3b06a98505132c72790
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,9 -20,10 +20,10 @@@ Build-Depends: cmake
                 libxml2-dev,
                 libxslt1-dev,
                 pkgconf,
+                protobuf-compiler,
                 qtbase5-dev,
                 qttools5-dev,
 -               qtwebengine5-dev [amd64 arm64 armhf i386 mips64el],
 +               qtwebengine5-dev [amd64 arm64 i386 mips64el],
                 sharutils,
                 xauth,
                 xvfb,