From: Raspbian automatic forward porter Date: Thu, 24 Jun 2021 18:40:16 +0000 (+0100) Subject: Merge version 10.3+rpi1+deb10u9 and 10.3+deb10u10 to produce 10.3+rpi1+deb10u10 X-Git-Tag: raspbian/10.3+rpi1+deb10u10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3abf041545bd1216ec18d3456d5fa869539802e5;p=base-files.git Merge version 10.3+rpi1+deb10u9 and 10.3+deb10u10 to produce 10.3+rpi1+deb10u10 --- e6d64f2897f2b052e0d15ea9792d3db51646b926 diff --cc debian/changelog index e177a45,e71c6eb..bd2a0dc --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (10.3+rpi1+deb10u9) buster-staging; urgency=medium ++base-files (10.3+rpi1+deb10u10) 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 Tue, 30 Mar 2021 01:16:56 +0000 ++ -- Raspbian forward porter Thu, 24 Jun 2021 18:40:16 +0000 ++ + base-files (10.3+deb10u10) buster; urgency=medium + + * Change /etc/debian_version to 10.10, for Debian 10.10 point release. + + -- Santiago Vila Sun, 13 Jun 2021 12:30:00 +0200 base-files (10.3+deb10u9) buster; urgency=medium