Finalisation of 15.0.1 prior to upload

diff --git a/debian/changelog b/debian/changelog
index 37cab231e094f0f7d0a8152e167525162391a5e5..996c99f9383d9bc0b56ba33bf3c3fbd08c93490c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-pysam (0.15.0.1+ds-1) experimental; urgency=medium
+
+  * Team upload.
+
+  * New upstream version.
+
+ -- Steffen Moeller <moeller@debian.org>  Sun, 29 Jul 2018 00:51:38 +0200
+
 python-pysam (0.14.1+ds-1) UNRELEASED; urgency=medium
 
   [ Afif Elghraoui ]

diff --git a/debian/control b/debian/control
index 376c426c82d08cab1635ee4bb4f693f63aa61e94..88a5d8483e6231d7dbb826ba36f07c90c43ed869 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Priority: optional
 Build-Depends: debhelper (>= 11~),
                dh-exec,
                dh-python,
-               libhts-dev (>= 1.7),
+               libhts-dev (>= 1.9),
                zlib1g-dev,
                python-all-dev,
                python-setuptools,

diff --git a/debian/patches/series b/debian/patches/series
index 881b73d7594bcb20a3285c7f369718fe718e5d38..c2b6af4b2470d59c4c7182ad2a799ed7b9f0fc13 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-execute-linking-tests-only-when-explicitely-reque.patch
-xfail.patch
-skip_test_needing_missing_data.patch
+#execute-linking-tests-only-when-explicitely-reque.patch
+#xfail.patch
+#skip_test_needing_missing_data.patch

diff --git a/debian/patches/skip_test_needing_missing_data.patch b/debian/patches/skip_test_needing_missing_data.patch
index 9673e16f22d5ee9b7de1306395facec05acebe5a..43a729f0b2198553c61f3a3f5670b98ab267ad18 100644 (file)
--- a/debian/patches/skip_test_needing_missing_data.patch
+++ b/debian/patches/skip_test_needing_missing_data.patch
@@ -4,21 +4,11 @@ Author: Andreas Tille <tille@debian.org>
 Last-Update: Sat, 17 Feb 2018 15:24:34 +0100
 Forwarded: https://github.com/pysam-developers/pysam/issues/626
 
---- python-pysam.orig/tests/pysam_data/Makefile
-+++ python-pysam/tests/pysam_data/Makefile
-@@ -20,8 +20,7 @@
-       explicit_index.bam explicit_index.cram \
-       faidx_empty_seq.fq.gz \
-       ex1.fa.gz ex1.fa.gz.csi \
--      ex1_csi.bam \
--      example_reverse_complement.bam
-+      ex1_csi.bam
- 
- # ex2.sam - as ex1.sam, but with header
- ex2.sam.gz: ex1.bam ex1.bam.bai
+Index: python-pysam/tests/AlignmentFile_test.py
+===================================================================
 --- python-pysam.orig/tests/AlignmentFile_test.py
 +++ python-pysam/tests/AlignmentFile_test.py
-@@ -1359,12 +1359,7 @@
+@@ -1403,12 +1403,7 @@ class TestEmptyHeader(unittest.TestCase)
                                               'example_empty_header.bam'))
          self.assertEqual(s.header.to_dict(), {'SQ': [{'LN': 1000, 'SN': 'chr1'}]})
  

diff --git a/debian/patches/xfail.patch b/debian/patches/xfail.patch
index 40fb7b96af7f2291a4bb4e81256da966c8a0f8bd..e549fec7dce69ff98242ef5517354794e510f581 100644 (file)
--- a/debian/patches/xfail.patch
+++ b/debian/patches/xfail.patch
@@ -3,9 +3,11 @@ Description: temporarily skip failing test
 Author: Afif Elghraoui <afif@debian.org>
 Forwarded: not-needed
 Last-Update: 2017-10-01
---- a/tests/AlignmentFile_test.py
-+++ b/tests/AlignmentFile_test.py
-@@ -474,6 +474,7 @@ class TestIO(unittest.TestCase):
+Index: python-pysam/tests/AlignmentFile_test.py
+===================================================================
+--- python-pysam.orig/tests/AlignmentFile_test.py
++++ python-pysam/tests/AlignmentFile_test.py
+@@ -472,6 +472,7 @@ class TestIO(unittest.TestCase):
                         "tmp_ex2.bam",
                         "rb", "wb")