Merge version 2.29.1-4+rpi1 and 2.29.1-5 to produce 2.29.1-5+rpi1

diff --cc debian/changelog
index e9946b205a4b2c7078d3b54a2726a04e5d57f0d6,ecc2462013ef281fd831914725fab18bde2841c7..6e4adb9c799433acf1b54a8efefe4b8256fa7fab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- binutils (2.29.1-4+rpi1) buster-staging; urgency=medium
++binutils (2.29.1-5+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Oct 2017 17:26:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Oct 2017 00:47:03 +0000
++
+ binutils (2.29.1-5) unstable; urgency=medium
+ 
+   * Update, taken from the 2.29 branch 20171017.
+     - Fix PR binutils/22245, undefined behavior in bfd_set_error.
+     - Correct ctor/dtor in init_array/fini_array error value.
+   * Stop installing i586 compat links for i386 builds. Closes: #877791.
+   * Build a binutils-i686-linux-gnu package on amd64 and x32 too.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 17 Oct 2017 11:29:33 +0200
  
  binutils (2.29.1-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge