From: Peter Michael Green Date: Thu, 6 Jun 2019 15:43:27 +0000 (+0000) Subject: Manual merge of version 10.1+rpi1 and 10.3 to produce 10.3+rpi1 X-Git-Tag: archive/raspbian/10.3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=148321b1dccf0428c3f94265a5eff6abf0a31244;p=base-files.git Manual merge of version 10.1+rpi1 and 10.3 to produce 10.3+rpi1 Move etc/os-release changes from direct in the file to debian/rules to reduce the chance of future merge failures. Move debian/rules file editing code to the install step, to eliminate the need for code to revert it. Add build-dependency on moreutils to support new code in debian/rules --- 148321b1dccf0428c3f94265a5eff6abf0a31244 diff --cc debian/changelog index 9d5d6ef,d6032a7..6074a86 --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,27 +1,45 @@@ - base-files (10.1+rpi1) buster-staging; urgency=medium ++base-files (10.3+rpi1) 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 Wed, 24 Jan 2018 07:50:05 +0000 ++ -- Peter Michael Green Thu, 06 Jun 2019 15:42:15 +0000 ++ + base-files (10.3) unstable; urgency=medium + + * Add Breaks: debian-security-support (<< 2019.04.25). Closes: #928172. + This is the first version of debian-security-support which does not break + when /etc/debian_version contains a string in the form "10.x". + + -- Santiago Vila Mon, 13 May 2019 22:25:32 +0200 + + base-files (10.2) unstable; urgency=medium + + * Release candidate for buster as stable: + - Use "10" as version in /etc/issue and /etc/issue.net. + (never expected to change after buster is released) + - Use 10.0 as version in /etc/debian_version. + (expected to change at every point release) + - Change PRETTY_NAME in /usr/lib/os-release, adding 10 as version number + and "(buster)" as codename. Add also VERSION_ID and VERSION. + (never expected to change) + - Add VERSION_CODENAME to os-release. Closes: #829245. This is optional + according to the specs but some people find it useful. Please note that + for now this is only expected to be present on stable releases. + - Update README (buster -> bullseye). + + -- Santiago Vila Fri, 19 Apr 2019 13:05:00 +0200 base-files (10.1) unstable; urgency=medium diff --cc debian/control index 579f216,3c6754f..ed72db8 --- 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) ++Build-Depends: debhelper (>= 9), moreutils Package: base-files Provides: base diff --cc debian/rules index 3038244,88db04b..67cf6b7 --- a/debian/rules +++ b/debian/rules @@@ -42,6 -33,6 +33,15 @@@ endi sed -e "s&#OSNAME#&$(OSNAME)&g" etc/issue > $(DESTDIR)/etc/issue sed -e "s&#OSNAME#&$(OSNAME)&g" etc/issue.net > $(DESTDIR)/etc/issue.net sed -e "s&#OSNAME#&$(OSNAME)&g" etc/os-release > $(DESTDIR)/etc/os-release ++ sed -i s/Debian/Raspbian/ $(DESTDIR)/etc/issue ++ sed -i s/Debian/Raspbian/ $(DESTDIR)/etc/issue.net ++ sed -i s/Debian/Raspbian/ $(DESTDIR)/etc/os-release ++ egrep -v '^(ID|HOME_URL|SUPPORT_URL|BUG_REPORT_URL)' $(DESTDIR)/etc/os-release | sponge $(DESTDIR)/etc/os-release ++ echo 'ID=raspbian' >> $(DESTDIR)/etc/os-release ++ echo 'ID_LIKE=debian' >> $(DESTDIR)/etc/os-release ++ echo 'HOME_URL="http://www.raspbian.org/"' >> $(DESTDIR)/etc/os-release ++ echo 'SUPPORT_URL="http://www.raspbian.org/RaspbianForums"' >> $(DESTDIR)/etc/os-release ++ echo 'BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"' >> $(DESTDIR)/etc/os-release mv $(DESTDIR)/etc/os-release $(DESTDIR)/usr/lib/os-release ln -s ../usr/lib/os-release $(DESTDIR)/etc/os-release