Merge version 10.3+rpi1+deb10u11 and 10.3+deb10u12 to produce 10.3+rpi1+deb10u12

diff --cc debian/changelog
index 0ff4ffde218fcaa7f0cb59a64924f3778bd77c9a,117c7a38f9882da723046a3529dd152c34cb9063..73d39f8dc244556ea166dcb4ef642560db1ed2d8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (10.3+rpi1+deb10u11) buster-staging; urgency=medium
++base-files (10.3+rpi1+deb10u12) 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>  Sat, 09 Oct 2021 14:13:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Mar 2022 02:43:37 +0000
++
+ base-files (10.3+deb10u12) buster; urgency=medium
+ 
+   * Change /etc/debian_version to 10.12, for Debian 10.12 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sat, 19 Mar 2022 14:44:00 +0100
  
  base-files (10.3+deb10u11) buster; urgency=medium