[med-svn] [snakemake] 01/01: Future-proof test workaround patch

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository snakemake.

commit b4796b909ed78ccb5ce7cc70f9aeeb83f35d0eb3
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Sun Jan 15 16:22:03 2017 +1100

    Future-proof test workaround patch
---
 debian/changelog                      |  7 +++++++
 debian/patches/0006-restore-bin.patch | 14 ++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cbb209..77c0815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+snakemake (3.9.1-2) UNRELEASED; urgency=medium
+
+  * Future-proof patch to work-around missing snakemake binary when running
+    tests before installation
+
+ -- Kevin Murray <kdmfoss at gmail.com>  Sun, 15 Jan 2017 16:23:25 +1100
+
 snakemake (3.9.1-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/0006-restore-bin.patch b/debian/patches/0006-restore-bin.patch
index eac0e93..4f29501 100644
--- a/debian/patches/0006-restore-bin.patch
+++ b/debian/patches/0006-restore-bin.patch
@@ -5,16 +5,10 @@ Description: Version 3.9.1 is lacking snakemake executable - using the
 
 --- /dev/null
 +++ b/bin/snakemake
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,6 @@
 +#!/usr/bin/python3
-+# EASY-INSTALL-ENTRY-SCRIPT: 'snakemake==3.9.1','console_scripts','snakemake'
-+__requires__ = 'snakemake==3.9.1'
-+import re
 +import sys
-+from pkg_resources import load_entry_point
++import snakemake
 +
-+if __name__ == '__main__':
-+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-+    sys.exit(
-+        load_entry_point('snakemake==3.9.1', 'console_scripts', 'snakemake')()
-+    )
++
++sys.exit(snakemake.main())

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