From: Raspbian automatic forward porter Date: Wed, 9 Dec 2020 22:40:32 +0000 (+0000) Subject: Merge version 10.3+rpi1+deb10u6 and 10.3+deb10u7 to produce 10.3+rpi1+deb10u7 X-Git-Tag: archive/raspbian/10.3+rpi1+deb10u7^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7f75927c97a4cebe6436063a57b197620c1babbf;p=base-files.git Merge version 10.3+rpi1+deb10u6 and 10.3+deb10u7 to produce 10.3+rpi1+deb10u7 --- 7f75927c97a4cebe6436063a57b197620c1babbf diff --cc debian/changelog index 9bf3ba4,4ad2606..b017299 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (10.3+rpi1+deb10u6) buster-staging; urgency=medium ++base-files (10.3+rpi1+deb10u7) 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, 27 Sep 2020 21:41:06 +0000 ++ -- Raspbian forward porter Wed, 09 Dec 2020 22:40:31 +0000 ++ + base-files (10.3+deb10u7) buster; urgency=medium + + * Change /etc/debian_version to 10.7, for Debian 10.7 point release. + + -- Santiago Vila Sun, 22 Nov 2020 13:37:00 +0100 base-files (10.3+deb10u6) buster; urgency=medium