From: Peter Michael Green <plugwash@raspbian.org>
Date: Mon, 9 Sep 2019 23:21:23 +0000 (+0000)
Subject: Manual merge of version 9.9+rpi1+deb9u9 and 9.9+deb9u11 to produce 9.9+rpi1+deb9u11
X-Git-Tag: archive/raspbian/9.9+rpi1+deb9u11^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b0e699438ce0f7dfcddf40229f4f4779d63b1d72;p=base-files.git

Manual merge of version 9.9+rpi1+deb9u9 and 9.9+deb9u11 to produce 9.9+rpi1+deb9u11
---

b0e699438ce0f7dfcddf40229f4f4779d63b1d72
diff --cc debian/changelog
index a669b7d,3f6417c..42a4177
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,26 @@@
- base-files (9.9+rpi1+deb9u9) stretch-staging; urgency=medium
++base-files (9.9+rpi1+deb9u11) 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>  Sat, 27 Apr 2019 12:12:10 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 09 Sep 2019 23:20:47 +0000
++
+ base-files (9.9+deb9u11) stretch; urgency=emergency
+ 
+   * Non-maintainer upload.
+   * Change /etc/debian_version to 9.11, for Debian 9.11 point release.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Sun, 08 Sep 2019 12:51:39 +0200
+ 
+ base-files (9.9+deb9u10) stretch; urgency=medium
+ 
+   * Change /etc/debian_version to 9.10, for Debian 9.10 point release.
+   * Add VERSION_CODENAME to os-release. Closes: #829245. Please note
+     that this is only for stable releases.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 30 Aug 2019 14:27:24 +0200
  
  base-files (9.9+deb9u9) stretch; urgency=medium
  
diff --cc etc/os-release
index 23df384,ac920f5..017d9a8
--- a/etc/os-release
+++ b/etc/os-release
@@@ -1,9 -1,9 +1,10 @@@
 -PRETTY_NAME="Debian #OSNAME# 9 (stretch)"
 -NAME="Debian #OSNAME#"
 +PRETTY_NAME="Raspbian #OSNAME# 9 (stretch)"
 +NAME="Raspbian #OSNAME#"
  VERSION_ID="9"
  VERSION="9 (stretch)"
+ VERSION_CODENAME=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"