[med-svn] [python-pysam] 01/01: Refresh patches.

Charles Plessy plessy at moszumanska.debian.org
Sat Apr 19 04:57:07 UTC 2014


This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository python-pysam.

commit 3dd0f19176cb555974cbf16cb704454d4a86d1e6
Author: Charles Plessy <plessy at debian.org>
Date:   Sat Apr 19 12:00:29 2014 +0900

    Refresh patches.
---
 debian/patches/do_not_use_distribute_setup.patch | 24 ++++++++++++------------
 debian/patches/fix_cleanup_tests.patch           |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/do_not_use_distribute_setup.patch b/debian/patches/do_not_use_distribute_setup.patch
index fd60f92..44166fe 100644
--- 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 at 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 178876e..852dd09 100644
--- 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pysam.git



More information about the debian-med-commit mailing list