From: Raspbian automatic forward porter Date: Sun, 10 May 2020 20:59:30 +0000 (+0100) Subject: Merge version 10.3+rpi1+deb10u3 and 10.3+deb10u4 to produce 10.3+rpi1+deb10u4 X-Git-Tag: archive/raspbian/10.3+rpi1+deb10u4^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=04a33b0ecccada53781b13162240ff012fe97ed0;p=base-files.git Merge version 10.3+rpi1+deb10u3 and 10.3+deb10u4 to produce 10.3+rpi1+deb10u4 --- 04a33b0ecccada53781b13162240ff012fe97ed0 diff --cc debian/changelog index 3a974e2,77b8640..ac5f446 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (10.3+rpi1+deb10u3) buster-staging; urgency=medium ++base-files (10.3+rpi1+deb10u4) 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 Sun, 09 Feb 2020 02:47:44 +0000 ++ -- Raspbian forward porter Sun, 10 May 2020 20:59:30 +0000 ++ + base-files (10.3+deb10u4) buster; urgency=medium + + * Change /etc/debian_version to 10.4, for Debian 10.4 point release. + + -- Santiago Vila Sat, 02 May 2020 18:39:00 +0200 base-files (10.3+deb10u3) buster; urgency=medium