Manual merge of version 9.7+rpi1 and 9.8 to produce 9.8+rpi1

diff --cc debian/changelog
index 32fff54d6e4d72bf52f99096d0e318b28dd5c204,5dcaa28e95d276660ed76cec977f04f8deefd85b..ad72b1a2240643a35867041af4537303f6902a31
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,26 @@@
- base-files (9.7+rpi1) stretch-staging; urgency=medium
++base-files (9.8+rpi1) stretch-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 04 Dec 2016 00:32:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Jan 2017 02:26:54 +0000
++
+ base-files (9.8) unstable; urgency=medium
+ 
+   * Release candidate for stretch as stable:
+   - Use "9" as version in /etc/issue and /etc/issue.net.
+     (never expected to change after stretch is released)
+   - Use 9.0 as version in /etc/debian_version.
+     (expected to change at every point release)
+   - Change PRETTY_NAME in /usr/lib/os-release, adding 9 as version number
+     and "(stretch)" as codename. Add also VERSION_ID and VERSION.
+     (never expected to change)
+   - Update README (stretch -> buster).
+   * Standards-Version: 3.9.8 (no special changes for this).
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 15 Jan 2017 23:00:02 +0100
  
  base-files (9.7) unstable; urgency=medium
  

diff --cc etc/issue
index e05ccea46eac0526ed02585ff0527496c4f105a6,48c423c99841ee7596fc6e080345df091cb25654..decfd9130bced2579d50d1bd3c0834223a410989
--- 1/etc/issue
--- 2/etc/issue
+++ b/etc/issue
@@@ -1,2 -1,2 +1,1 @@@
- Raspbian #OSNAME# stretch/sid \n \l
 -Debian #OSNAME# 9 \n \l
--
++Raspbian #OSNAME# 9 \n \l

diff --cc etc/issue.net
index bca7fed75fbd63ab0fb9c7a353d57dfcb6763347,0fc38cdb9e71cf51bdb709a0afc4f44c70da3015..9c3b15f7e72aa66a23cde33543910da68d7dcc26
--- 1/etc/issue.net
--- 2/etc/issue.net
+++ b/etc/issue.net
@@@ -1,1 -1,1 +1,1 @@@
- Raspbian #OSNAME# stretch/sid
 -Debian #OSNAME# 9
++Raspbian #OSNAME# 9

diff --cc etc/os-release
index 93e6f890801a531e387776dc2127f9c0e290b799,0c83c2df23a2c14cada1e2844a9e88686bcaa6c4..23df384ff7a21b92b5cef42c623558ba6287fc25
--- 1/etc/os-release
--- 2/etc/os-release
+++ b/etc/os-release
@@@ -1,7 -1,8 +1,9 @@@
- PRETTY_NAME="Raspbian #OSNAME# stretch/sid"
 -PRETTY_NAME="Debian #OSNAME# 9 (stretch)"
 -NAME="Debian #OSNAME#"
++PRETTY_NAME="Raspbian #OSNAME# 9 (stretch)"
 +NAME="Raspbian #OSNAME#"
+ VERSION_ID="9"
+ VERSION="9 (stretch)"
 -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"