This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository qcumber.
commit 494d871e28fd6f9ba74fff098ef35d060f4fbbe4 Author: Andreas Tille <[email protected]> Date: Thu Nov 24 11:48:10 2016 +0100 Make sure config files will be found --- debian/bin/qcumber | 5 +++++ debian/install | 1 + debian/links | 3 ++- debian/patches/config_in_etc.patch | 11 +++++++++++ debian/patches/series | 2 +- debian/rules | 1 + 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/bin/qcumber b/debian/bin/qcumber new file mode 100644 index 0000000..58eeb0d --- /dev/null +++ b/debian/bin/qcumber @@ -0,0 +1,5 @@ +#!/bin/sh +# Wrapper needed to let QCumber properly find its configuration file +# in the same dir as the Python3 code resides + +python3 /usr/share/qcumber/QCumber.py "$@" diff --git a/debian/install b/debian/install index da73614..f67dca8 100644 --- a/debian/install +++ b/debian/install @@ -2,3 +2,4 @@ config.txt etc/qcumber parameter.txt etc/qcumber *.tex usr/share/qcumber +debian/bin usr diff --git a/debian/links b/debian/links index b0cd1ea..8732c3e 100644 --- a/debian/links +++ b/debian/links @@ -1 +1,2 @@ -usr/share/qcumber/QCumber.py usr/bin/qcumber +etc/qcumber/parameter.txt usr/share/qcumber/parameter.txt +etc/qcumber/config.txt usr/share/qcumber/config.txt diff --git a/debian/patches/config_in_etc.patch b/debian/patches/config_in_etc.patch index 9f1b739..88b1c68 100644 --- a/debian/patches/config_in_etc.patch +++ b/debian/patches/config_in_etc.patch @@ -18,3 +18,14 @@ Description: Config file should be in /etc/qcumber path_dict = config[section] return path_dict[name] +--- a/QCumber.py ++++ b/QCumber.py +@@ -22,7 +22,7 @@ except ImportError: + + + parameter = configparser.ConfigParser() +-parameter.read(join(dirname(__file__), "parameter.txt")) ++parameter.read(join(dirname(__file__), "/etc/qcumber/parameter.txt")) + + file_extensions = parameter["Fileextension"]["fastq"] + r1_pattern = parameter["Pattern"]["R1"] diff --git a/debian/patches/series b/debian/patches/series index dc8fde8..ec041aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ python3_explicit.patch set_absolute_path_to_tex_template.patch adapt_config.patch -config_in_etc.patch +# config_in_etc.patch diff --git a/debian/rules b/debian/rules index d51dd19..ed17df6 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_fixperms: chmod a-x debian/*/usr/share/*/classes.py chmod a-x debian/*/usr/share/*/helper.py dos2unix debian/*/usr/share/*/*.py + #dos2unix debian/*/etc/qcumber/*.txt #get-orig-source: # . debian/get-orig-source -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/qcumber.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
