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

diff --cc debian/changelog
index 9d5d6ef553912f64569d3c61ad141d15be841f7a,d6032a7fa2d4d3f7a16ba2079fd11ebe53dcb7ed..6074a8670c8fbe5312a70e5bf1d0f4f8d5f0aeb8
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org>  Wed, 24 Jan 2018 07:50:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  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 <sanvila@debian.org>  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 <sanvila@debian.org>  Fri, 19 Apr 2019 13:05:00 +0200
  
  base-files (10.1) unstable; urgency=medium
  

diff --cc debian/control
index 579f21682b80d85b43ab4c02590d220a9664eb71,3c6754f9d1f790cca4fb38d1c09141ac005f4f05..ed72db88fb75e7cdbcf6f7fb3708c5f6e4ac6f15
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: admi
  Priority: required
  Maintainer: Santiago Vila <sanvila@debian.org>
  Standards-Version: 4.1.3
--Build-Depends: debhelper (>= 9)
++Build-Depends: debhelper (>= 9), moreutils
  
  Package: base-files
  Provides: base

diff --cc debian/rules
index 30382449d1ed2d0ce02a0afeabbcaa98017ca0f1,88db04b665da501c1254c4b5a80ac299ef21258d..67cf6b72ce50455fb13d923c13d8e52472f48607
--- 1/debian/rules
--- 2/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