Merge version 1.3.2-1+rpi1 and 1.3.2-2 to produce 1.3.2-2+rpi1

diff --cc debian/changelog
index e85fc3d64d78a9b77bf6a304b9feb6fa14f48eb8,f77e67a8273dbbd97a09f0db62bd673bfdf04f90..9de7e77d47836b42dfcca8e14aefb1d338cb2d63
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- htslib (1.3.2-1+rpi1) stretch-staging; urgency=medium
++htslib (1.3.2-2+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1.2.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 29 Sep 2015 19:03:00 +0000]
 +  * Fix bus errors in testsuite.
 +  
 +  [changes introduced in 1.2.1-2+rpi1 by Peter Michael Green]
 +  * Cleanup duplicated patching with one version bad that made it impossible to unpack source package
 +    manually.
 +  * Remove single-debian-patch from debian/source/options, it was almost certainly responsible for
 +    the above source package screwup.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 29 Nov 2016 02:43:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2017 06:59:17 +0000
++
+ htslib (1.3.2-2) unstable; urgency=medium
+ 
+   * Add build-essential and @builddeps@ to autopkgtest
+   * debhelper 10
+   * d/watch: version=4
+ 
+  -- Andreas Tille <tille@debian.org>  Sat, 14 Jan 2017 19:23:52 +0100
  
  htslib (1.3.2-1) unstable; urgency=medium