Merge version 5.1.17-4+rpi1 and 5.1.17-6 to produce 5.1.17-6+rpi1

diff --cc debian/changelog
index cf2fe9980704315b610dc164dfae8a290cf98d83,c0e032988b48a82375d5546558bceb8a052f110b..ec7ef4c038e99427070c620d0ca52d7ccb7fe724
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- supermin (5.1.17-4+rpi1) stretch-staging; urgency=medium
++supermin (5.1.17-6+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
 +  * Build-depend on raspbian kernel rather than debian armmp kernel.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 20 Nov 2016 17:01:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Jan 2017 12:16:34 +0000
++
+ supermin (5.1.17-6) unstable; urgency=medium
+ 
+   * Fix build dependency for determining Built-Using (Closes: #850974)
+   
+  -- Hilko Bengen <bengen@debian.org>  Wed, 11 Jan 2017 19:53:12 +0100
+ 
+ supermin (5.1.17-5) unstable; urgency=medium
+ 
+   * Remove links from febootstrap package (Closes: #850635)
+   * Remove old NEWS, TODO items from debian/
+   * Tweak Built-Using in an attempt to fix FTBFS on alpha
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 09 Jan 2017 23:44:14 +0100
  
  supermin (5.1.17-4) unstable; urgency=medium
  

diff --cc debian/control
Simple merge