From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 20 Jan 2017 02:38:25 +0000 (+0000)
Subject: Manual merge of version 9.7+rpi1 and 9.8 to produce 9.8+rpi1
X-Git-Tag: archive/raspbian/9.8+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=363dcf34647d41318aa624f786651b07e1bb8007;p=base-files.git

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

363dcf34647d41318aa624f786651b07e1bb8007
diff --cc debian/changelog
index 32fff54,5dcaa28..ad72b1a
--- a/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 e05ccea,48c423c..decfd91
--- a/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 bca7fed,0fc38cd..9c3b15f
--- a/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 93e6f89,0c83c2d..23df384
--- a/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"