Merge version 11.1+rpi1+deb11u4 and 11.1+deb11u5 to produce 11.1+rpi1+deb11u5

diff --cc debian/changelog
index bdb1ea152a9e58475b2bf24606b5d1109a3459fe,7acd4325f77e96e3ca5427bd8cff2e2fef1d4b49..3ea7de1297ff1b37d5a911971687418e7725b170
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (11.1+rpi1+deb11u4) bullseye-staging; urgency=medium
++base-files (11.1+rpi1+deb11u5) 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>  Wed, 13 Jul 2022 13:50:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 12 Sep 2022 00:26:22 +0000
++
+ base-files (11.1+deb11u5) bullseye; urgency=medium
+ 
+   * Change /etc/debian_version to 11.5, for Debian 11.5 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sat, 03 Sep 2022 14:10:00 +0200
  
  base-files (11.1+deb11u4) bullseye; urgency=medium