Refresh patches.

diff --git a/debian/patches/do_not_use_distribute_setup.patch b/debian/patches/do_not_use_distribute_setup.patch
index fd60f92134de6c0e53c44fe3731604f537e3dd10..44166fefceb9939e7056c3d52a7a0be34fc9829d 100644 (file)
--- a/debian/patches/do_not_use_distribute_setup.patch
+++ b/debian/patches/do_not_use_distribute_setup.patch
@@ -2,16 +2,16 @@ Author: Olivier Sallou <olivier.sallou@irisa.fr>
 Last-Updated: Fri, 07 Feb 2014 18:29:40 +0100
 Description: Prevent downloading distribute_setup
 
---- pysam.orig/setup.py
-+++ pysam/setup.py
-@@ -127,8 +127,8 @@
- # cp samtools/win32/*.h pysam/include/win32
- 
- 
--from distribute_setup import use_setuptools
--use_setuptools()
-+#from distribute_setup import use_setuptools
-+#use_setuptools()
- 
- from setuptools import Extension, setup, find_packages
+--- a/setup.py
++++ b/setup.py
+@@ -129,8 +129,8 @@
+ try:
+     from setuptools import Extension, setup, find_packages
+ except ImportError:
+-    from ez_setup import use_setuptools
+-    use_setuptools()
++    #from ez_setup import use_setuptools
++    #use_setuptools()
+     from setuptools import Extension, setup, find_packages
  
+ #######################################################

diff --git a/debian/patches/fix_cleanup_tests.patch b/debian/patches/fix_cleanup_tests.patch
index 178876e29d292eee1a29b9c3c464d81f90f0ebec..852dd09d5dac944e414fc38a6b3f6940b5b202d7 100644 (file)
--- a/debian/patches/fix_cleanup_tests.patch
+++ b/debian/patches/fix_cleanup_tests.patch
@@ -5,8 +5,8 @@ Description: Prevent tests makefile from deleting files which
 
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -47,6 +47,11 @@ example_bai.bam: ex1.bam
- 
+@@ -47,6 +47,11 @@
+       samtools view -bS $< > $@
  
  clean:
 +      mkdir keep_bam_files