Support building with missing htslib directory

diff --git a/debian/changelog b/debian/changelog
index 5cde36a9e33676f7a0526f8367e714ee2a7be6f5..3cbc0c56aced2e6a130d255970ce090b7d9ec0e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-pysam (0.8.3-1) UNRELEASED; urgency=medium
+python-pysam (0.8.3+ds1-1) UNRELEASED; urgency=medium
 
   * Team upload.
 

diff --git a/debian/patches/correct-spelling-errors.patch b/debian/patches/correct-spelling-errors.patch
index 84e56448703357eacccfd4a33dce5542abe0f52f..0b9c5cb33bd5e8d390d92cd2d5aebbbc70847c0e 100644 (file)
--- a/debian/patches/correct-spelling-errors.patch
+++ b/debian/patches/correct-spelling-errors.patch
@@ -4,17 +4,6 @@ Bug: https://github.com/pysam-developers/pysam/pull/122
 Last-Update: 2015-06-09
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- python-pysam.orig/htslib/cram/cram_index.c
-+++ python-pysam/htslib/cram/cram_index.c
-@@ -315,7 +315,7 @@
- 
- /*
-  * Searches the index for the first slice overlapping a reference ID
-- * and position, or one immediately preceeding it if none is found in
-+ * and position, or one immediately preceding it if none is found in
-  * the index to overlap this position. (Our index may have missing
-  * entries, but we require at least one per reference.)
-  *
 --- python-pysam.orig/pysam/calignmentfile.pyx
 +++ python-pysam/pysam/calignmentfile.pyx
 @@ -1442,7 +1442,7 @@

diff --git a/debian/patches/ignore-htslib-dir.patch b/debian/patches/ignore-htslib-dir.patch
new file mode 100644 (file)
index 0000000..0a73343
--- /dev/null
+++ b/debian/patches/ignore-htslib-dir.patch
@@ -0,0 +1,27 @@
+Description: Allow setup.py to cope with missing htslib copy
+ The build system expects the convenience copy to be present.
+ This change allows the build to work without it. After all,
+ we're linking with the Debian htslib package.
+Author: Afif Elghraoui
+Last-Update: 2015-06-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- python-pysam.orig/setup.py
++++ python-pysam/setup.py
+@@ -476,8 +476,6 @@
+     'url': "https://github.com/pysam-developers/pysam",
+     'packages': ['pysam',
+                  'pysam.include',
+-                 'pysam.include.htslib',
+-                 'pysam.include.htslib.htslib',
+                  'pysam.include.samtools',
+                  # 'pysam.include.samtools.bcftools',
+                  'pysam.include.samtools.win32'],
+@@ -493,7 +493,6 @@
+                     faidx],
+     'cmdclass': cmdclass,
+     'package_dir': {'pysam': 'pysam',
+-                    'pysam.include.htslib': 'htslib',
+                     'pysam.include.samtools': 'samtools'},
+     'package_data': {'': ['*.pxd', '*.h'], },
+     # do not pack in order to permit linking to csamtools.so

diff --git a/debian/patches/series b/debian/patches/series
index 73ffeaa7320d148357db2dcb27d92c3a7d9d826b..22c82d0e4a5827f259c9eb9022de34dbe112c45e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 change-htslib-statement-to-link-to-debian
 adding-include-hts-dirs
 correct-spelling-errors.patch
+ignore-htslib-dir.patch