Merge version 0.17.13-1+rpi1 and 0.17.13-3 to produce 0.17.13-3+rpi1

diff --cc debian/changelog
index fc76a14795f4843a8409238258eaa55672a4a24a,e750f2ef699abc04b558d93f370a6a25344a52ca..ed314a673560cec54fdac3ad24859fa871df183e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,20 +1,27 @@@
- libgdata (0.17.13-1+rpi1) bullseye-staging; urgency=medium
++libgdata (0.17.13-3+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 0.17.13-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 19 Nov 2020 22:03:07 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Nov 2020 22:03:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 08 Feb 2021 09:50:48 +0000
++
+ libgdata (0.17.13-3) unstable; urgency=medium
+ 
+   * debian/control.in: Add several -doc packages to the BDI to fix links
+     between documentation files.  Also mark the libgdata-doc with
+     Build-Profiles: <!nodoc>
+   * debian/rules: Only build the GTK doc if we are building libgdata-doc
+ 
+  -- Laurent Bigonville <bigon@debian.org>  Thu, 21 Jan 2021 18:24:26 +0100
+ 
+ libgdata (0.17.13-2) unstable; urgency=medium
+ 
+   * debian/control.in: Rename libuhttpmock-dev BD to libuhttpmock-0.0-dev
+     (Closes: #948105)
+   * debian/control.in: Bump Standards-Version to 4.5.1 (no further changes)
+   * debian/control.in: Fix the dependencies of the libgdata-tests package
+ 
+  -- Laurent Bigonville <bigon@debian.org>  Thu, 21 Jan 2021 17:23:53 +0100
  
  libgdata (0.17.13-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge