From: Raspbian forward pporter <root@raspbian.org>
Date: Fri, 9 Jun 2017 07:45:55 +0000 (+0000)
Subject: Merge version 1.168+rpi1 and 1.169 to produce 1.169+rpi1
X-Git-Tag: archive/raspbian/1.169+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=976688023ded9ddd5b56a8c6a35ab342d35ae495;p=base-installer.git

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

976688023ded9ddd5b56a8c6a35ab342d35ae495
diff --cc debian/changelog
index 2df331c,9f7476f..7f32581
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- base-installer (1.168+rpi1) stretch-staging; urgency=medium
++base-installer (1.169+rpi1) stretch-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>  Thu, 30 Mar 2017 12:43:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Jun 2017 07:45:54 +0000
++
+ base-installer (1.169) unstable; urgency=medium
+ 
+   * library.sh: If there is no suitable resume device, explicitly disable
+     resume (see #860403)
+ 
+  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 31 May 2017 18:19:10 +0100
  
  base-installer (1.168) unstable; urgency=medium