From: Raspbian automatic forward porter Date: Mon, 9 Sep 2019 13:42:06 +0000 (+0100) Subject: Merge version 10.3+rpi1 and 10.3+deb10u1 to produce 10.3+rpi1+deb10u1 X-Git-Tag: archive/raspbian/10.3+rpi1+deb10u1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8cc46eece41a78128c8d4caa9eaef37bd041a4c2;p=base-files.git Merge version 10.3+rpi1 and 10.3+deb10u1 to produce 10.3+rpi1+deb10u1 --- 8cc46eece41a78128c8d4caa9eaef37bd041a4c2 diff --cc debian/changelog index 6074a86,0ca28db..1a0caea --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,8 +1,26 @@@ - base-files (10.3+rpi1) buster-staging; urgency=medium ++base-files (10.3+rpi1+deb10u1) 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. + - -- Peter Michael Green Thu, 06 Jun 2019 15:42:15 +0000 ++ -- Raspbian forward porter Mon, 09 Sep 2019 13:42:06 +0000 ++ + base-files (10.3+deb10u1) buster; urgency=medium + + * Change /etc/debian_version to 10.1, for Debian 10.1 point release. + + -- Santiago Vila Fri, 30 Aug 2019 14:31:26 +0200 base-files (10.3) unstable; urgency=medium