From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 7 Dec 2017 16:21:58 +0000 (+0000)
Subject: Manual merge of version 0.12.0.1+ds-3+rpi1 and 0.12.0.1+ds-4 to produce 0.12.0.1... 
X-Git-Tag: archive/raspbian/0.12.0.1+ds-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=43d3ffeb2c7ca1bb9c1d4b03f110acf658bed22a;p=python-pysam.git

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

43d3ffeb2c7ca1bb9c1d4b03f110acf658bed22a
diff --cc debian/changelog
index bde1e04,2d1ac83..cc2afce
--- a/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 60062a1,cb44816..7bb00f5
--- a/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