From: Raspbian automatic forward porter Date: Sun, 27 Sep 2020 21:41:07 +0000 (+0100) Subject: Merge version 10.3+rpi1+deb10u4 and 10.3+deb10u6 to produce 10.3+rpi1+deb10u6 X-Git-Tag: archive/raspbian/10.3+rpi1+deb10u6^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d221e7abe6a02c3fd3be3b593890c0ebf828afb2;p=base-files.git Merge version 10.3+rpi1+deb10u4 and 10.3+deb10u6 to produce 10.3+rpi1+deb10u6 --- d221e7abe6a02c3fd3be3b593890c0ebf828afb2 diff --cc debian/changelog index ac5f446,ca06262..9bf3ba4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,14 +1,32 @@@ - base-files (10.3+rpi1+deb10u4) buster-staging; urgency=medium ++base-files (10.3+rpi1+deb10u6) 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, 10 May 2020 20:59:30 +0000 ++ -- Raspbian forward porter Sun, 27 Sep 2020 21:41:06 +0000 ++ + base-files (10.3+deb10u6) buster; urgency=medium + + * Change /etc/debian_version to 10.6, for Debian 10.6 point release. + + -- Santiago Vila Sat, 19 Sep 2020 23:39:00 +0200 + + base-files (10.3+deb10u5) buster; urgency=medium + + * Change /etc/debian_version to 10.5, for Debian 10.5 point release. + + -- Santiago Vila Fri, 10 Jul 2020 23:04:00 +0200 base-files (10.3+deb10u4) buster; urgency=medium