Merge version 11.1+rpi1+deb11u1 and 11.1+deb11u2 to produce 11.1+rpi1+deb11u2

diff --cc debian/changelog
index e9f64bfc573455c9c581fbeb5f02c3c5ded1a95b,5e7958860384a14ea2adfddaaa98a93f939f7efd..db50ba024a2001eb377767c02877d11284a1d1e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (11.1+rpi1+deb11u1) bullseye-staging; urgency=medium
++base-files (11.1+rpi1+deb11u2) bullseye-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:21:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Dec 2021 15:49:31 +0000
++
+ base-files (11.1+deb11u2) bullseye; urgency=medium
+ 
+   * Change /etc/debian_version to 11.2, for Debian 11.2 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sat, 11 Dec 2021 18:25:00 +0100
  
  base-files (11.1+deb11u1) bullseye; urgency=medium