[med-svn] [snakemake] 03/09: Refresh patches

[Andreas Tille]

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

tille pushed a commit to tag debian/3.9.1-1
in repository snakemake.

commit ca552f38bf455ed9239ba116ea5ff0c140a3f362
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 9 14:14:00 2017 +0100

    Refresh patches
---
 debian/patches/0001-Use-the-inbuild-sphinx.ext.napoleon.patch | 4 +---
 debian/patches/0003-Compat-fix.patch                          | 4 +---
 debian/patches/0003-Use-debian-s-mathjax-package.patch        | 6 +-----
 debian/patches/0004-drop_test_symlink_time_handling.patch     | 2 +-
 debian/patches/0005-drop_test_symlink_temp.patch              | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0001-Use-the-inbuild-sphinx.ext.napoleon.patch b/debian/patches/0001-Use-the-inbuild-sphinx.ext.napoleon.patch
index 9d24ce0..3d59b6e 100644
--- a/debian/patches/0001-Use-the-inbuild-sphinx.ext.napoleon.patch
+++ b/debian/patches/0001-Use-the-inbuild-sphinx.ext.napoleon.patch
@@ -8,11 +8,9 @@ sphinx proper, as sphinx.ext.napoleon.
  docs/conf.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/docs/conf.py b/docs/conf.py
-index 38eb443..528b9f9 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -34,7 +34,7 @@ extensions = [
+@@ -33,7 +33,7 @@ extensions = [
      'sphinx.ext.autodoc',
      'sphinx.ext.mathjax',
      'sphinx.ext.viewcode',
diff --git a/debian/patches/0003-Compat-fix.patch b/debian/patches/0003-Compat-fix.patch
index 3b7c936..1985351 100644
--- a/debian/patches/0003-Compat-fix.patch
+++ b/debian/patches/0003-Compat-fix.patch
@@ -6,11 +6,9 @@ Subject: Compat fix
  tests/test_symlink_time_handling/Snakefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/tests/test_symlink_time_handling/Snakefile b/tests/test_symlink_time_handling/Snakefile
-index c878ef1..10fab79 100644
 --- a/tests/test_symlink_time_handling/Snakefile
 +++ b/tests/test_symlink_time_handling/Snakefile
-@@ -40,7 +40,7 @@ shell("touch -h -t {} input_link".format(timestr(4)))
+@@ -40,7 +40,7 @@ shell("touch -h -t {} input_link".format
  shell("ln -s input_link output_link")
  shell("touch -h -t {} output_link".format(timestr(2)))
  
diff --git a/debian/patches/0003-Use-debian-s-mathjax-package.patch b/debian/patches/0003-Use-debian-s-mathjax-package.patch
index f3a72a5..e911051 100644
--- a/debian/patches/0003-Use-debian-s-mathjax-package.patch
+++ b/debian/patches/0003-Use-debian-s-mathjax-package.patch
@@ -8,11 +8,9 @@ Use debian's mathjax package
  snakemake/gui.html | 6 +++---
  2 files changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/docs/conf.py b/docs/conf.py
-index 528b9f9..382744e 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -37,6 +37,9 @@ extensions = [
+@@ -36,6 +36,9 @@ extensions = [
      'sphinx.ext.napoleon'
  ]
  
@@ -22,8 +20,6 @@ index 528b9f9..382744e 100644
  # Add any paths that contain templates here, relative to this directory.
  templates_path = ['_templates']
  
-diff --git a/snakemake/gui.html b/snakemake/gui.html
-index 22ad7af..3010462 100644
 --- a/snakemake/gui.html
 +++ b/snakemake/gui.html
 @@ -1,11 +1,11 @@
diff --git a/debian/patches/0004-drop_test_symlink_time_handling.patch b/debian/patches/0004-drop_test_symlink_time_handling.patch
index 9d77fdb..6711e28 100644
--- a/debian/patches/0004-drop_test_symlink_time_handling.patch
+++ b/debian/patches/0004-drop_test_symlink_time_handling.patch
@@ -5,7 +5,7 @@ Description: Ignore failures of test that might happpen in pbuilder
 
 --- a/tests/tests.py
 +++ b/tests/tests.py
-@@ -342,7 +342,11 @@ def test_input_generator():
+@@ -345,7 +345,11 @@ def test_input_generator():
  def test_symlink_time_handling():
      #See Snakefile for notes on why this fails on some systems
      if os.utime in os.supports_follow_symlinks:
diff --git a/debian/patches/0005-drop_test_symlink_temp.patch b/debian/patches/0005-drop_test_symlink_temp.patch
index c7fd129..09faa34 100644
--- a/debian/patches/0005-drop_test_symlink_temp.patch
+++ b/debian/patches/0005-drop_test_symlink_temp.patch
@@ -5,7 +5,7 @@ Description: Ignore failures of test that might happpen in pbuilder
 
 --- a/tests/tests.py
 +++ b/tests/tests.py
-@@ -297,10 +297,6 @@ def test_cluster_sync():
+@@ -300,10 +300,6 @@ def test_cluster_sync():
          cluster_sync="./qsub")
  
  

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