Manual merge of version 0.12.0.1+ds-3+rpi1 and 0.12.0.1+ds-4 to produce 0.12.0.1...

diff --cc debian/changelog
index bde1e04fd79e3836d753506bdae1b44ca2d0257c,2d1ac835e6d316456dea5b9e13100eda91b6f3c6..cc2afceb09655b8628898790ba7931a001cdf9e5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,16 +1,23 @@@
- python-pysam (0.12.0.1+ds-3+rpi1) buster-staging; urgency=medium
++python-pysam (0.12.0.1+ds-4+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 0.12.0.1+ds-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 09 Nov 2017 01:20:03 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 09 Nov 2017 01:20:03 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 03 Dec 2017 15:18:13 +0000
++
+ python-pysam (0.12.0.1+ds-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Revert "Skip tests on ppc64el to avoid build-dep on bcftools currently
+     uninstallable".  It seems to be installable now, and anyway now that the
+     python3 transition is done we should fix it properly anyway.
+   * d/control:
+     + Bump the libhts-dev buil-dep to 1.5-3, to make sure we gain appropriate
+       versioned symbols and therefore an appropriate versioned dependency on
+       libhts2.  Closes: #879867
+     + Bump Standards-Version to 4.1.1.
+ 
+  -- Mattia Rizzolo <mattia@debian.org>  Fri, 10 Nov 2017 12:56:10 +0100
  
  python-pysam (0.12.0.1+ds-3) unstable; urgency=medium
  

diff --cc debian/rules
index 60062a1ac0a6a0ad2161199be019917195eb3f6c,cb44816f1b1b46ec5d3887b71899cfa68ff38528..7bb00f52f1ba9386c5b31995d5a3f6924b81e8cc
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -22,16 -22,12 +22,12 @@@ clean: clean-test
  override_dh_install: clean-tests
        dh_install -Xtest.gtf.gz
  
--ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
- #ifneq ($(DEB_HOST_ARCH),ppc64el)
 -override_dh_auto_test: pysam_data.all cbcf_data.all
 -      dh_auto_test
 -else
++#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 +#override_dh_auto_test: pysam_data.all cbcf_data.all
 +#     dh_auto_test
 +#else
  override_dh_auto_test:
 -endif
 +#endif
- else
- override_dh_auto_test:
- endif
  
  override_dh_auto_clean:
        dh_auto_clean