From: Raspbian automatic forward porter Date: Thu, 18 Jul 2019 01:28:08 +0000 (+0100) Subject: Merge version 10.3+rpi1 and 11 to produce 11+rpi1 X-Git-Tag: archive/raspbian/11+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c8d52eb9771a8c05bdbb69743861eea1a1dd87e;p=base-files.git Merge version 10.3+rpi1 and 11 to produce 11+rpi1 --- 81867be81a8021cd613745289574f0d914d5bfb6 diff --cc debian/changelog index 6074a86,51926f1..003d801 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,11 +1,29 @@@ - base-files (10.3+rpi1) buster-staging; urgency=medium ++base-files (11+rpi1) bullseye-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 Thu, 18 Jul 2019 01:28:08 +0000 ++ + base-files (11) unstable; urgency=medium + + * Change issue, issue.net, debian_version and os-release to read + "bullseye/sid". + * Drop VERSION, VERSION_ID and CODENAME from os-release. + * Make "mesg n" silent in default /root/.profile. Closes: #930654. + + -- Santiago Vila Tue, 09 Jul 2019 12:05:50 +0200 base-files (10.3) unstable; urgency=medium