From: Raspbian automatic forward porter Date: Wed, 13 Jul 2022 13:50:13 +0000 (+0100) Subject: Merge version 11.1+rpi1+deb11u3 and 11.1+deb11u4 to produce 11.1+rpi1+deb11u4 X-Git-Tag: archive/raspbian/11.1+rpi1+deb11u4^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ebb290e9d6b06a15134a6191b894fa672884da1c;p=base-files.git Merge version 11.1+rpi1+deb11u3 and 11.1+deb11u4 to produce 11.1+rpi1+deb11u4 --- ebb290e9d6b06a15134a6191b894fa672884da1c diff --cc debian/changelog index ed8ebd8,62b8444..bdb1ea1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (11.1+rpi1+deb11u3) bullseye-staging; urgency=medium ++base-files (11.1+rpi1+deb11u4) bullseye-staging; urgency=medium + + [changes brought forward from 8+rpi1 by Peter Michael Green 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 Sun, 27 Mar 2022 03:33:30 +0000 ++ -- Raspbian forward porter Wed, 13 Jul 2022 13:50:13 +0000 ++ + base-files (11.1+deb11u4) bullseye; urgency=medium + + * Change /etc/debian_version to 11.4, for Debian 11.4 point release. + + -- Santiago Vila Thu, 30 Jun 2022 23:35:00 +0200 base-files (11.1+deb11u3) bullseye; urgency=medium