From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 28 Jun 2017 22:44:24 +0000 (+0100)
Subject: Merge version 1.169+rpi1 and 1.170 to produce 1.170+rpi1
X-Git-Tag: archive/raspbian/1.170+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=489639b87e074041e82480fac6c066024ad9af89;p=base-installer.git

Merge version 1.169+rpi1 and 1.170 to produce 1.170+rpi1
---

489639b87e074041e82480fac6c066024ad9af89
diff --cc debian/changelog
index 7f32581,45de05e..f3a73d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- base-installer (1.169+rpi1) stretch-staging; urgency=medium
++base-installer (1.170+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
 +  * Use raspbian-archive-keyring instead of debian-archive-keyring.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Jun 2017 07:45:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 28 Jun 2017 22:44:24 +0000
++
+ base-installer (1.170) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Simplified Chinese (zh_CN.po) by Yangfl
+ 
+  -- Christian Perrier <bubulle@debian.org>  Tue, 20 Jun 2017 08:26:26 +0200
  
  base-installer (1.169) unstable; urgency=medium