[med-svn] [obitools] 02/02: Adpat patches to new upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository obitools.

commit dd686a1083e9aee9904d0888ed181aa05052bb8c
Author: Andreas Tille <tille at debian.org>
Date:   Wed Dec 13 19:23:10 2017 +0100

    Adpat patches to new upstream version
---
 debian/patches/fix_path_interpreter | 16 ++++++++--------
 debian/patches/use_debian_libs      |  8 +++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix_path_interpreter b/debian/patches/fix_path_interpreter
index 5a93ac9..79cd983 100644
--- a/debian/patches/fix_path_interpreter
+++ b/debian/patches/fix_path_interpreter
@@ -33,14 +33,6 @@ Forwarded: no
  '''
  :py:mod:`ecodbtaxstat`: gives taxonomic rank frequency of a given ``ecopcr`` database   
  =====================================================================================
---- a/src/ecotag.py
-+++ b/src/ecotag.py
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- '''
- :py:mod:`ecotag`: assigns sequences to taxa
- ===========================================
 --- a/src/ecotaxspecificity.py
 +++ b/src/ecotaxspecificity.py
 @@ -1,4 +1,4 @@
@@ -313,3 +305,11 @@ Forwarded: no
  '''
  Created on 30 dec. 2009
  
+--- a/src/ecotag.py
++++ b/src/ecotag.py
+@@ -1,4 +1,4 @@
+-#!/usr/local/OBITools-1.1.22/bin/python
++#!/usr/bin/python
+ '''
+ :py:mod:`ecotag`: assigns sequences to taxa
+ ===========================================
diff --git a/debian/patches/use_debian_libs b/debian/patches/use_debian_libs
index 3777672..2010e15 100644
--- a/debian/patches/use_debian_libs
+++ b/debian/patches/use_debian_libs
@@ -7,7 +7,7 @@ Last-Updated: 2015-04-30
 Forwarded: no
 --- a/distutils.ext/obidistutils/serenity/__init__.py
 +++ b/distutils.ext/obidistutils/serenity/__init__.py
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ def serenity_snake(envname,package,versi
          
      log.info("%s will be installed with python : %s" % (package,virtualpython))
          
@@ -18,7 +18,7 @@ Forwarded: no
      
 --- a/distutils.ext/obidistutils/serenity/checkpackage.py
 +++ b/distutils.ext/obidistutils/serenity/checkpackage.py
-@@ -15,48 +15,7 @@
+@@ -15,48 +15,7 @@ from distutils import log
  from obidistutils.serenity.checkpip import get_a_pip_module
  
  def is_installed(requirement,pip=None):
@@ -70,7 +70,7 @@ Forwarded: no
  def get_requirements(pip=None):
 --- a/setup.py
 +++ b/setup.py
-@@ -66,7 +66,7 @@
+@@ -66,5 +66,5 @@ if __name__=="__main__":
            license=LICENSE,
            url=URL,
            python_src=SRC,
@@ -78,5 +78,3 @@ Forwarded: no
 -          serenity=serenity)
 +          sse='sse2')
 +          #serenity=serenity)
- 
- 

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