Merge branch 'debian/sid' into debian/experimental

diff --cc debian/changelog
index be1fd23047d84e23e8d0261f79e6c3f5911d0937,2a086ac77298c883c5e430776f79bd3df88aee9c..5f10987a69d927535bfec1f70392a2060d948031
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +rustc (1.19.0+dfsg2-1) UNRELEASED; urgency=medium
 +
 +  * DO NOT RELEASE, see TODO.Debian
 +  * New upstream release.
 +
 + -- Ximin Luo <infinity0@debian.org>  Mon, 24 Jul 2017 11:55:53 +0200
 +
+ rustc (1.18.0+dfsg1-4) unstable; urgency=medium
+ 
+   * Support gperf 3.1. (Closes: #869610)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Tue, 25 Jul 2017 23:19:47 +0200
+ 
  rustc (1.18.0+dfsg1-3) unstable; urgency=medium
  
    * Upload to unstable.

diff --cc debian/patches/series
index 30fb133f00fbc1ed5ea690768cc4b8180a3aa8a7,45d950767b4de89f6605ef958784135ee29b4836..ffb1308957152aeff09c193ba41e5e6c0889597b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -14,7 -16,9 +14,8 @@@ u-ignoretest-armhf_05.patc
  u-ignoretest-armhf_06.patch
  u-ignoretest-arm64.patch
  u-ignoretest-ppc64el.patch
 -u-workaround-testfailure-armhf_01.patch
  u-allow-disable-debuginfo-only-std.patch
+ u-gperf-3.1.patch
  
  # not forwarded, or forwarded but unlikely to be merged
  u-exception-traceback.patch