This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository manta.
commit 8b0811ae4ef3251e66bb840dc701881a78759a6d Author: Andreas Tille <[email protected]> Date: Tue May 2 14:19:31 2017 +0200 Adapt patches to new version 1.1.0 --- debian/changelog | 2 +- debian/patches/config_path.patch | 4 ++-- debian/patches/fix_comparison.patch | 2 +- debian/patches/use_debian_packaged_pyflow.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ed58ac..56fcfb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -manta (1.0.2+dfsg-1) UNRELEASED; urgency=medium +manta (1.1.0+dfsg-1) UNRELEASED; urgency=medium * Initial release (Closes: #<bug>) diff --git a/debian/patches/config_path.patch b/debian/patches/config_path.patch index 17c66a5..589d645 100644 --- a/debian/patches/config_path.patch +++ b/debian/patches/config_path.patch @@ -4,10 +4,10 @@ Description: Move config to /etc --- a/src/python/lib/configureOptions.py +++ b/src/python/lib/configureOptions.py -@@ -123,7 +123,7 @@ class ConfigureWorkflowOptions(object) : +@@ -124,7 +124,7 @@ class ConfigureWorkflowOptions(object) : configFileName=cmdlineScriptName+".ini" - cmdlineScriptDir=os.path.abspath(os.path.dirname(sys.argv[0])) + cmdlineScriptDir=os.path.abspath(os.path.dirname(realArg0)) - globalConfigPath=os.path.join(cmdlineScriptDir,configFileName) + globalConfigPath=os.path.join('/etc/manta',configFileName) updateIniSections(iniSections,getIniSections(globalConfigPath)) diff --git a/debian/patches/fix_comparison.patch b/debian/patches/fix_comparison.patch index 4bb59c5..39cdc30 100644 --- a/debian/patches/fix_comparison.patch +++ b/debian/patches/fix_comparison.patch @@ -4,7 +4,7 @@ Description: Adjust type in comparison --- a/src/c++/lib/htsapi/bam_util.cpp +++ b/src/c++/lib/htsapi/bam_util.cpp -@@ -39,7 +39,7 @@ change_bam_data_len(const int new_len, +@@ -38,7 +38,7 @@ change_bam_data_len(const int new_len, { assert(new_len>=0); diff --git a/debian/patches/use_debian_packaged_pyflow.patch b/debian/patches/use_debian_packaged_pyflow.patch index 5bef2c3..419d43f 100644 --- a/debian/patches/use_debian_packaged_pyflow.patch +++ b/debian/patches/use_debian_packaged_pyflow.patch @@ -8,7 +8,7 @@ Description: Check for Debian packaged python-pyflow # pyflow # --set(PYFLOW_PREFIX "pyflow-1.1.12") +-set(PYFLOW_PREFIX "pyflow-1.1.14") -set(PYFLOW_DIR "${CMAKE_CURRENT_BINARY_DIR}/${PYFLOW_PREFIX}") -set(PYFLOW_SCRIPT "${PYFLOW_DIR}/src/pyflow.py") +set(PYFLOW_SCRIPT "/usr/lib/python2.7/dist-packages/pyflow/pyflow.py") -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/manta.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
