This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository indelible.
commit c27931d1890c73782aa4a491723a27de630c305f Author: Andreas Tille <[email protected]> Date: Tue Oct 3 08:19:32 2017 +0200 Fix some spelling issues --- debian/changelog | 1 + debian/patches/0006-spelling.patch | 57 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 59 insertions(+) diff --git a/debian/changelog b/debian/changelog index f03becd..ccf0f7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ indelible (1.03-3) UNRELEASED; urgency=medium * Normalise Vcs fields using cme fix dpkg-control * Add fake watch file * debhelper 10 + * Fix some spelling issues [ Steffen Moeller ] * Added reference to OMICtools diff --git a/debian/patches/0006-spelling.patch b/debian/patches/0006-spelling.patch new file mode 100644 index 0000000..848c274 --- /dev/null +++ b/debian/patches/0006-spelling.patch @@ -0,0 +1,57 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Tue, 03 Oct 2017 08:18:07 +0200 +Description: Fix some spelling issues + +--- a/src/control.cpp ++++ b/src/control.cpp +@@ -1947,7 +1947,7 @@ int dealwithsites(vector<string> &block) + } + + if(a[0]!='C' || a[1]!='[' || a[a.size()-1]!=']') +- {controlerrorprint2("[SITES]", name, a, "Only one statement after the sites class name means you are specifiying\na codon sites class and you must use the following notation:\nC[mymodelname1,mymodelname2,mymodelname3] or\nC[mybranchclass1,mybranchclass2,mybranchclass3]",""); {if(breakonerror) return -1;} } ++ {controlerrorprint2("[SITES]", name, a, "Only one statement after the sites class name means you are specifying\na codon sites class and you must use the following notation:\nC[mymodelname1,mymodelname2,mymodelname3] or\nC[mybranchclass1,mybranchclass2,mybranchclass3]",""); {if(breakonerror) return -1;} } + + + +@@ -2107,7 +2107,7 @@ int dealwithbranches(vector<string> &blo + } + + if(mybracketleft!=mybracketright) +- {treeerror=true; controlerrorprint2("[BRANCHES]", name, "", "Number of parantheses in guide tree do not match.",""); {if(breakonerror) return -1;} } ++ {treeerror=true; controlerrorprint2("[BRANCHES]", name, "", "Number of parentheses in guide tree do not match.",""); {if(breakonerror) return -1;} } + + if(mybracketleft==0) + {treeerror=true; controlerrorprint2("[BRANCHES]", name,"", "Branch class guide tree must contain as least one set of parentheses.",""); {if(breakonerror) return -1;} } +@@ -2904,10 +2904,10 @@ int dealwithtrees(vector<string> &block) + + if(mybracketleft!=mybracketright) + {cout<<rawvalue<<endl<<mybracketleft<<" "<<mybracketright<<endl; +- treeerror=true; controlerrorprint2("[TREE]", name, commands.at(lasttest), "Number of parantheses in guide tree do not match.",""); {if(breakonerror) return -1;} } ++ treeerror=true; controlerrorprint2("[TREE]", name, commands.at(lasttest), "Number of parentheses in guide tree do not match.",""); {if(breakonerror) return -1;} } + + if(mybracketleft==0) +- {treeerror=true; controlerrorprint2("[TREE]", name, commands.at(lasttest), "Guide tree must contain as least one set of parentheses.",""); {if(breakonerror) return -1;} } ++ {treeerror=true; controlerrorprint2("[TREE]", name, commands.at(lasttest), "Guide tree mu st contain as least one set of parentheses.",""); {if(breakonerror) return -1;} } + + c1='Q'; c2='Q'; + int taxacount=0, coloncount=0, intbranch=0, extbranch=0; +@@ -2945,7 +2945,7 @@ int dealwithtrees(vector<string> &block) + + if(c2==')' && c1!=';' && lengthon==0) + { +- if(c1!=':') {treeerror=true; controlerrorprint2("[TREE]", name, commands.at(lasttest), "There is no branch length after a right paranthesis in the tree.\nIt happened here \""+lasterror+"\"",""); {if(breakonerror) return -1;} } ++ if(c1!=':') {treeerror=true; controlerrorprint2("[TREE]", name, commands.at(lasttest), "There is no branch length after a right parenthesis in the tree.\nIt happened here \""+lasterror+"\"",""); {if(breakonerror) return -1;} } + else {lengthon=1; currentlength="";} + } + +--- a/indelible.1 ++++ b/indelible.1 +@@ -7,7 +7,7 @@ indelible \- powerful and flexible simul + No options can be passed via the commandline. + .SH DESCRIPTION + .TP +-\fBindelible\fR can simulate evolution of multi-partitioned nucleotide, amino-acid, or codon data sets through the processes of insertion, deletion, and substitution in continous time. All common evolutionary models are supported. ++\fBindelible\fR can simulate evolution of multi-partitioned nucleotide, amino-acid, or codon data sets through the processes of insertion, deletion, and substitution in continuous time. All common evolutionary models are supported. + .TP + The full documentation for \fBindelible\fR is available under \fI/usr/share/doc/indelible/help/index.html\fR. + .SH CONFIGURATION diff --git a/debian/patches/series b/debian/patches/series index a60b50c..242ae70 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-added-manpage.patch 0004-added-auto-tools-build-system.patch 0005-remove-unnecessary-whitespace-from-the-end-of-sequen.patch +0006-spelling.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/indelible.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
