[med-svn] [khmer] 04/06: freshen patches

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository khmer.

commit bcf52437455fc50844a9630f865907129bd4f3f5
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue May 26 17:07:55 2015 -0400

    freshen patches
---
 debian/patches/disable_google_analytics | 12 +++++-------
 debian/patches/local-libs               |  6 +++---
 debian/patches/older-setuptools         | 24 ++++++++++++++++--------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/debian/patches/disable_google_analytics b/debian/patches/disable_google_analytics
index 23dde44..ec3626d 100644
--- a/debian/patches/disable_google_analytics
+++ b/debian/patches/disable_google_analytics
@@ -1,9 +1,9 @@
 Description: Turn off Google analytics as per Lintian warning
 Author: Michael R. Crusoe <michael.crusoe at gmail.com>
 
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -190,7 +190,7 @@
+--- khmer.orig/doc/conf.py
++++ khmer/doc/conf.py
+@@ -191,7 +191,7 @@
  # Various settings to pass to templates:
  
  html_context = {
@@ -12,9 +12,8 @@ Author: Michael R. Crusoe <michael.crusoe at gmail.com>
     "disqus_shortname" : 'khmer-docs',
  #   "github_base_account" : 'ged-lab',
     "github_project" : 'khmer',
-
---- khmer-1.1.orig/doc/_templates/page.html
-+++ khmer-1.1/doc/_templates/page.html
+--- khmer.orig/doc/_templates/page.html
++++ khmer/doc/_templates/page.html
 @@ -61,6 +61,7 @@
  
  {% endif %}
@@ -31,4 +30,3 @@ Author: Michael R. Crusoe <michael.crusoe at gmail.com>
  
  {% endblock %}
  
-
diff --git a/debian/patches/local-libs b/debian/patches/local-libs
index 31a0ce1..587ecc2 100644
--- a/debian/patches/local-libs
+++ b/debian/patches/local-libs
@@ -10,10 +10,10 @@ Author: Michael R. Crusoe <michael.crusoe at gmail.com>
 -# libraries = z,bz2
 +libraries = z,bz2
  ## if using system libraries
--include-dirs = lib:third-party/zlib:third-party/bzip2:third-party/seqan/core/include
+-include-dirs = lib:third-party/zlib:third-party/bzip2:third-party/seqan/core/include:third-party/smhasher
 -# include-dirs = lib
-+#include-dirs = lib:third-party/zlib:third-party/bzip2:third-party/seqan/core/include
-+include-dirs = lib:third-party/seqan/core/include
++#include-dirs = lib:third-party/zlib:third-party/bzip2:third-party/seqan/core/include:third-party/smhasher
++include-dirs = lib:third-party/seqan/core/include:third-party/smhasher
  ## if using system libraries (broken)
  
  # define = NDEBUG
diff --git a/debian/patches/older-setuptools b/debian/patches/older-setuptools
index a8989e4..c01be1e 100644
--- a/debian/patches/older-setuptools
+++ b/debian/patches/older-setuptools
@@ -1,14 +1,22 @@
 Description: Fix version of setuptools
 Author: Michael R. Crusoe <michael.crusoe at gmail.com>
 
---- khmer-1.2~rc1-77-g7ca05b4.orig/setup.py
-+++ khmer-1.2~rc1-77-g7ca05b4/setup.py
-@@ -6,7 +6,7 @@
- """ Setup for khmer project. """
- 
- import ez_setup
--ez_setup.use_setuptools(version="3.4.1")
-+ez_setup.use_setuptools(version="3.3")
+--- khmer.orig/setup.py
++++ khmer/setup.py
+@@ -5,8 +5,6 @@
+ # Contact: khmer-project at idyll.org
+ """Setup for khmer project."""
  
+-import ez_setup
+-
  import os
  import sys
+ from os import listdir as os_listdir
+@@ -24,7 +22,6 @@
+ from distutils.errors import DistutilsPlatformError
+ 
+ import versioneer
+-ez_setup.use_setuptools(version="3.4.1")
+ 
+ versioneer.VCS = 'git'
+ versioneer.versionfile_source = 'khmer/_version.py'

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