Merge version 11.1+rpi1+deb11u6 and 11.1+deb11u7 to produce 11.1+rpi1+deb11u7

diff --cc debian/changelog
index 4456c99ebd0d58cec274b78d5d1ad9e347af03ee,3bb3bdadb99bdea6ab878556c734e34487aefd13..d36e8c5fb5f489f01ec426cdfa5ea6455339949a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (11.1+rpi1+deb11u6) bullseye-staging; urgency=medium
++base-files (11.1+rpi1+deb11u7) 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>  Sun, 18 Dec 2022 15:44:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 12 May 2023 09:53:53 +0000
++
+ base-files (11.1+deb11u7) bullseye; urgency=medium
+ 
+   * Change /etc/debian_version to 11.7, for Debian 11.7 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 02 Apr 2023 13:55:00 +0200
  
  base-files (11.1+deb11u6) bullseye; urgency=medium