Manual merge of version 9.9+rpi1 and 10 to produce 10+rpi1

move some changes from direct in source tree to sed commands in debian/rules
to hopefully avoid merge conflicts in future.

diff --cc debian/changelog
index 1df7d8f9f413d1104dd6e7913806ec28fa1cf9c6,b66b0fd9016a4653c6dff2eb6c7f179ff1307d9e..2ea2b7836f08ab40c818aa83c579aababf07bdbd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,22 @@@
- base-files (9.9+rpi1) stretch-staging; urgency=medium
++base-files (10+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Apr 2017 13:26:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 01 Jul 2017 21:37:08 +0000
++
+ base-files (10) unstable; urgency=medium
+ 
+   * Change issue, issue.net, debian_version and os-release to read
+     "buster/sid", and drop VERSION and VERSION_ID from os-release.
+   * Fix typo in changelog for version 9.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Mon, 26 Jun 2017 00:19:42 +0200
  
  base-files (9.9) unstable; urgency=medium
  

diff --cc debian/rules
index 38e963546b8d96c1d5bf952d0679db0408c88466,7f4f7990be3c4b598de7930449641d0b4b53593b..9b6ab04c9a47b2d7bf60456a585822b6ded2a91d
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -13,7 -13,7 +13,16 @@@ VENDORFILE = raspbia
  %:
        dh $@
  
++override_dh_auto_clean:
++      dh_auto_clean
++      sed -i s/Raspbian/Debian/ etc/issue
++      sed -i s/Raspbian/Debian/ etc/issue.net
++      sed -i s/Raspbian/Debian/ etc/os-release
++
  override_dh_auto_build:
++      sed -i s/Debian/Raspbian/ etc/issue
++      sed -i s/Debian/Raspbian/ etc/issue.net
++      sed -i s/Debian/Raspbian/ etc/os-release
        sh debian/check-md5sum-etc profile
        sed -e "s&#OSNAME#&$(OSNAME)&g" debian/copyright.in > debian/copyright
        sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in > debian/postinst

diff --cc etc/os-release
index 23df384ff7a21b92b5cef42c623558ba6287fc25,7a2f2c264f602c9db5719f6a339d05ba05e125be..876c10f01ba17d04a502ed0bd33fb4a3c6b22411
--- 1/etc/os-release
--- 2/etc/os-release
+++ b/etc/os-release
@@@ -1,9 -1,6 +1,7 @@@
- PRETTY_NAME="Raspbian #OSNAME# 9 (stretch)"
- NAME="Raspbian #OSNAME#"
- VERSION_ID="9"
- VERSION="9 (stretch)"
+ PRETTY_NAME="Debian #OSNAME# buster/sid"
+ NAME="Debian #OSNAME#"
 -ID=debian
 -HOME_URL="https://www.debian.org/"
 -SUPPORT_URL="https://www.debian.org/support"
 -BUG_REPORT_URL="https://bugs.debian.org/"
 +ID=raspbian
 +ID_LIKE=debian
 +HOME_URL="http://www.raspbian.org/"
- SUPPORT_URL="http://www.raspbian.org/RaspbianForums"
- BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
++SUPPORT_URL="http://www.raspbian.org/DebianForums"
++BUG_REPORT_URL="http://www.raspbian.org/DebianBugs"