From: Raspbian automatic forward porter Date: Thu, 27 May 2021 19:53:32 +0000 (+0100) Subject: Merge version 11+rpi1 and 11.1 to produce 11.1+rpi1 X-Git-Tag: archive/raspbian/11.1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=74921130a58c12f41dfa5be1748aa09e8155a439;p=base-files.git Merge version 11+rpi1 and 11.1 to produce 11.1+rpi1 --- 74921130a58c12f41dfa5be1748aa09e8155a439 diff --cc debian/changelog index 003d801,ca12cb4..3457b20 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,25 +1,43 @@@ - base-files (11+rpi1) bullseye-staging; urgency=medium ++base-files (11.1+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. + - -- Raspbian forward porter Thu, 18 Jul 2019 01:28:08 +0000 ++ -- Raspbian forward porter Thu, 27 May 2021 19:53:31 +0000 ++ + base-files (11.1) unstable; urgency=medium + + * Use https where appropriate, namely, origins/debian (currently used) + and share/staff-group-for-usr-local (not anymore). Closes: #959470. + * Gracefully handle /usr/share/info not existing. Closes: #977113. + * Use $() instead of `` where appropriate, namely, the default files + for /etc/profile and /root/.bashrc. Closes: #982687. + * Update share/profile.md5sums as the default file has changed. + * Update build-dependency on debhelper. + * Release candidate for bullseye as stable: + - Use "11" as version in /etc/issue and /etc/issue.net. + (never expected to change after buster is released) + - Use 11.0 as version in /etc/debian_version. + (expected to change at every point release) + - Change PRETTY_NAME in /usr/lib/os-release, adding 11 as version number + and "(bullseye)" as codename. Add also VERSION_ID and VERSION. + (never expected to change) + - Add VERSION_CODENAME to os-release. + (only expected on stable releases) + - Update README (bullseye -> bookworm). + + -- Santiago Vila Sat, 10 Apr 2021 22:15:00 +0200 base-files (11) unstable; urgency=medium diff --cc debian/control index ed72db8,960c5d4..d976e47 --- a/debian/control +++ b/debian/control @@@ -3,7 -3,7 +3,7 @@@ Section: admi Priority: required Maintainer: Santiago Vila Standards-Version: 4.1.3 - Build-Depends: debhelper (>= 9), moreutils -Build-Depends: debhelper-compat (= 13) ++Build-Depends: debhelper-compat (= 13), moreutils Package: base-files Provides: base