[med-svn] [cwltool] 05/05: new upstream release

[Michael Crusoe]

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

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

commit 70cecb475d186f9fb9bb4642935d10d5de7fda7e
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Thu May 5 07:48:54 2016 -0700

    new upstream release
---
 debian/changelog                |  4 ++--
 debian/control                  |  4 ++--
 debian/patches/no-typing        | 19 +++++++++++++++++++
 debian/patches/series           |  2 +-
 debian/patches/use-older-rdflib | 13 -------------
 debian/rules                    |  5 +++++
 6 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f5ed77..37d42c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-cwltool (1.0.20160316204054-1) UNRELEASED; urgency=medium
+cwltool (1.0.20160504183010-1) UNRELEASED; urgency=medium
 
   * New upstream release 
 
- -- Michael R. Crusoe <crusoe at ucdavis.edu>  Fri, 18 Mar 2016 06:38:28 -0700
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Thu, 05 May 2016 07:48:41 -0700
 
 cwltool (1.0.20160209222805-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0a2b562..5fe728e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: cwltool
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Michael R. Crusoe <crusoe at ucdavis.edu>
+Uploaders: Michael R. Crusoe <michael.crusoe at gmail.com>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                python-html5lib,
                python-sparqlwrapper,
                help2man
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/cwltool.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/cwltool.git
 Homepage: http://www.commonwl.org
diff --git a/debian/patches/no-typing b/debian/patches/no-typing
new file mode 100644
index 0000000..a6ae8b7
--- /dev/null
+++ b/debian/patches/no-typing
@@ -0,0 +1,19 @@
+Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Description: Skip typing
+--- cwltool.orig/cwltool.egg-info/requires.txt
++++ cwltool/cwltool.egg-info/requires.txt
+@@ -4,4 +4,3 @@
+ rdflib-jsonld >= 0.3.0
+ shellescape
+ schema_salad == 1.7.20160316203940
+-typing
+--- cwltool.orig/setup.py
++++ cwltool/setup.py
+@@ -37,7 +37,6 @@
+           'rdflib-jsonld >= 0.3.0',
+           'shellescape',
+           'schema_salad == 1.7.20160316203940',
+-          'typing'
+         ],
+       test_suite='tests',
+       tests_require=[],
diff --git a/debian/patches/series b/debian/patches/series
index e5ff395..aabb5d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-use-older-rdflib
+no-typing
diff --git a/debian/patches/use-older-rdflib b/debian/patches/use-older-rdflib
deleted file mode 100644
index 5ce3f99..0000000
--- a/debian/patches/use-older-rdflib
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Michael R. Crusoe <crusoe at ucdavis.edu>
-Description: Try the older rdflib
---- cwltool.orig/setup.py
-+++ cwltool/setup.py
-@@ -36,7 +36,7 @@
-       install_requires=[
-           'requests',
-           'PyYAML',
--          'rdflib >= 4.2.0',
-+          'rdflib >= 4.1.0',
-           'rdflib-jsonld >= 0.3.0',
-           'shellescape',
-           'schema_salad == 1.7.20160316203940'
diff --git a/debian/rules b/debian/rules
index 0d11b51..51e50b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,10 @@ export HOME=$(shell echo $$PWD"/fakehome")
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
+override_dh_auto_build:
+	find cwltool -name "*.py" | xargs sed -i 's/.*typing.*/#&/g'
+	dh_auto_build
+
 debian/cwltool.1: debian/rules debian/cwltool.help2man
 	python2 setup.py develop --user
 	#help2man cwltool/main.py -I debian/cwltool.help2man -N -n "Reference executor for Common Workflow Language" -o debian/cwltool.1
@@ -22,3 +26,4 @@ override_dh_installman: debian/cwltest.1 debian/cwltool.1
 override_dh_clean:
 	dh_clean
 	rm -f debian/cwltest.1 debian/cwltool.1
+	find cwltool -name "*.py" | xargs sed -i 's/#\(.*typing.*\)/\1/g'

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