Merge version 10.3+rpi1+deb10u4 and 10.3+deb10u5 to produce 10.3+rpi1+deb10u5

diff --cc debian/changelog
index ac5f446f7b2fe7b426b81828e09be4a880879877,895f484e0d0cda09013a3dd778a3320168c89ebf..46f6e2487ca888a8836f17c38ade2642f1561e69
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (10.3+rpi1+deb10u4) buster-staging; urgency=medium
++base-files (10.3+rpi1+deb10u5) buster-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +  [changes introduced in 10+rpi1 by Peter Michael Green]
 +  * Make some changes using sed in debian/rules rather than directly in source
 +    package to avoid merge conflicts.
 +  [changes introduced in 10.3+rpi1 by Peter Michael Green]
 +  * Make further changes in debian/rules rather than directly to files in
 +    package to further avoid merge conflicts.
 +  * Make changes in debian/rules in the "install" step to avoid the need for
 +    code to revert them.
 +  * Add build-dependency on moreutils to support new code in debian/rules.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 10 May 2020 20:59:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 02 Aug 2020 09:42:23 +0000
++
+ base-files (10.3+deb10u5) buster; urgency=medium
+ 
+   * Change /etc/debian_version to 10.5, for Debian 10.5 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 10 Jul 2020 23:04:00 +0200
  
  base-files (10.3+deb10u4) buster; urgency=medium