From: Raspbian automatic forward porter Date: Sat, 9 Oct 2021 14:13:58 +0000 (+0100) Subject: Merge version 10.3+rpi1+deb10u10 and 10.3+deb10u11 to produce 10.3+rpi1+deb10u11 X-Git-Tag: archive/raspbian/10.3+rpi1+deb10u11^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aac70c25b4ed1c00a790ac8d5bd5ffe77983c3da;p=base-files.git Merge version 10.3+rpi1+deb10u10 and 10.3+deb10u11 to produce 10.3+rpi1+deb10u11 --- aac70c25b4ed1c00a790ac8d5bd5ffe77983c3da diff --cc debian/changelog index bd2a0dc,cc091bb..0ff4ffd --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (10.3+rpi1+deb10u10) buster-staging; urgency=medium ++base-files (10.3+rpi1+deb10u11) buster-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 Thu, 24 Jun 2021 18:40:16 +0000 ++ -- Raspbian forward porter Sat, 09 Oct 2021 14:13:58 +0000 ++ + base-files (10.3+deb10u11) buster; urgency=medium + + * Change /etc/debian_version to 10.11, for Debian 10.11 point release. + + -- Santiago Vila Sun, 03 Oct 2021 11:00:00 +0200 base-files (10.3+deb10u10) buster; urgency=medium