Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index 03ececb8365448d66e2ed84cc47bfc65994dfba3,980fe0fd3b5a0123bbe0d9ad22b06d2f229dabc4..aed368951b4ecc6cef9b764d900bd45475c3a679
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ bcftools (1.4.1-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Fix FTBFS on architectures where char is unsigned by default,
+     thanks Adrian Bunk (Closes: #865060)
+ 
+  -- Graham Inggs <ginggs@debian.org>  Wed, 19 Jul 2017 11:00:08 +0200
+ 
+ bcftools (1.4.1-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version
+     Closes: #865006
+   * debhelper 10
+ 
+  -- Andreas Tille <tille@debian.org>  Sun, 18 Jun 2017 21:41:36 +0200
+ 
 +bcftools (1.3.1-1+rpi1) buster-staging; urgency=medium
 +
 +  * Disable testsuite.
 +
 + -- Peter Michael Green <plugwash@raspbian.org>  Sat, 29 Jul 2017 09:40:04 +0000
 +
  bcftools (1.3.1-1) unstable; urgency=medium
  
    * Imported Upstream version 1.3.1