Merge version 10.3+rpi1 and 10.3+deb10u1 to produce 10.3+rpi1+deb10u1

diff --cc debian/changelog
index 6074a8670c8fbe5312a70e5bf1d0f4f8d5f0aeb8,0ca28db297a9bdb1139d2e64b150ee1a406e38a5..1a0caea097164eefb323837739b6aca9d420133e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (10.3+rpi1) buster-staging; urgency=medium
++base-files (10.3+rpi1+deb10u1) 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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 06 Jun 2019 15:42:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Sep 2019 13:42:06 +0000
++
+ base-files (10.3+deb10u1) buster; urgency=medium
+ 
+   * Change /etc/debian_version to 10.1, for Debian 10.1 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 30 Aug 2019 14:31:26 +0200
  
  base-files (10.3) unstable; urgency=medium