This is an automated email from the git hooks/post-receive script. satta pushed a commit to branch master in repository augustus.
commit 0dfffa1d38ced31a0464e030a4bb44e0879929db Author: Sascha Steinbiss <[email protected]> Date: Sun Dec 11 10:10:54 2016 +0000 add spelling patch --- debian/patches/series | 1 + debian/patches/spelling | 246 ------------------------------------------ debian/patches/spelling.patch | 130 ++++++++++++++++++++++ 3 files changed, 131 insertions(+), 246 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 8e23e91..385b56e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ search_config_path set_installdir keep_cflags buildflags.patch +spelling.patch diff --git a/debian/patches/spelling b/debian/patches/spelling deleted file mode 100644 index 5946c57..0000000 --- a/debian/patches/spelling +++ /dev/null @@ -1,246 +0,0 @@ -Description: Fix spelling errors. -Author: Sascha Steinbiss <[email protected]> ---- a/auxprogs/bam2hints/bam2hints.cc -+++ b/auxprogs/bam2hints/bam2hints.cc -@@ -515,7 +515,7 @@ - << " You should generate exonpart hints from RNA-Seq using wiggle (.wig) input to wig2hints.\n" - << " --ep_cutoff=n -e this many bp are cut off of each exonpart hint at end of alignment (set to " << EpCutoff << ")\n" - << " --source=s -s source identifier (set to '" << Source << "')\n" -- << " --intronsonly -I only retreive intron hints (e.g. because the exon(part) hints are retreived by converting to a wig track, set to " << OnOff(IntOnly) << ")\n" -+ << " --intronsonly -I only retrieve intron hints (e.g. because the exon(part) hints are retrieved by converting to a wig track, set to " << OnOff(IntOnly) << ")\n" - << " deprecated as this is the default now\n" - << " --nomult -n do not summarize multiple identical intron hints to a single one (set to " << OnOff(!Mult) << ")\n" - << " --remove_redundant -r only keep the strongest hint for a region (set to " << OnOff(RemRed) << ")\n" ---- a/auxprogs/homGeneMapping/src/main.cc -+++ b/auxprogs/homGeneMapping/src/main.cc -@@ -130,7 +130,7 @@ - // check if the boost library is installed (only required for option --printHomologs) - if(!homGeneFile.empty()){ - #ifndef BOOST -- throw ProjectError("The option --printHomologs requires the boost C++ libary.\n" -+ throw ProjectError("The option --printHomologs requires the boost C++ library.\n" - "Please install the boost library, e.g. using the APT package manager\n\n" - "sudo apt-get install libboost-graph-dev\n\n" - "Then edit the Makefile by setting the flag BOOST = true and recompile homGeneMapping.\n"); ---- a/include/statemodel.hh -+++ b/include/statemodel.hh -@@ -144,7 +144,7 @@ - - /* - * classes Snippet* -- * intelligently store and retreive the sequence emission probabilities of the sequence from a to b -+ * intelligently store and retrieve the sequence emission probabilities of the sequence from a to b - * for common pairs of a and b - */ - class SnippetListItem { ---- a/scripts/blat2hints.pl -+++ b/scripts/blat2hints.pl -@@ -26,7 +26,7 @@ - $usage .= " --maxQgaplen=n maximum length of gap in query (cDNA) sequence (default 5)\n"; - $usage .= " --ep_cutoff=n this many bp are cut off of each exonpart hint at end of alignment (default 10)\n"; - $usage .= " --source=s source identifier (default 'E')\n"; --$usage .= " --intronsonly only retrieve intron hints (e.g. because the exon(part) hints are retreived by converting to a wig track, default: off)\n"; -+$usage .= " --intronsonly only retrieve intron hints (e.g. because the exon(part) hints are retrieved by converting to a wig track, default: off)\n"; - $usage .= " --nomult do not summarize multiple identical intron hints to a single one\n"; - $usage .= " --remove_redundant only keep the strongest hint for a region (default false)\n"; - $usage .= " --maxcoverage=n maximal number of hints at a given position. A high value causes long running time of\n"; ---- a/scripts/evalCGP.pl -+++ b/scripts/evalCGP.pl -@@ -134,7 +134,7 @@ - die ("eval is not executable. Please add the directory which contains the executable evaluate_gtf.pl to the PATH environment variable or specify the path with --eval_exec_dir."); - } - if (qx("$cmdpars{'eval_exec_dir'}evaluate_gtf.pl" 2>&1) =~ /^Can\'t\slocate\s(\w+\.pm)/ ){ -- die ("eval is not executable. The perl libary " . $1 . " cannot be located.\n" . -+ die ("eval is not executable. The perl library " . $1 . " cannot be located.\n" . - "Please add the directory which contains " . $1 . " to the PERL5LIB environment variable, e.g. add the following line to your .bashrc file:\n\n" . - "export PERL5LIB=\$PERL5LIB:/path/to/" . $1 . "\n\n"); - } ---- a/scripts/optimize_augustus.pl -+++ b/scripts/optimize_augustus.pl -@@ -198,7 +198,7 @@ - die ("eval is not executable. Please add the directory which contains the executable evaluate_gtf.pl to the PATH environment variable or specify the path with --eval_exec_dir."); - } - if (qx("$cmdpars{'eval_exec_dir'}evaluate_gtf.pl" 2>&1) =~ /^Can\'t\slocate\s(\w+\.pm)/ ){ -- die ("eval is not executable. The perl libary " . $1 . " cannot be located.\n" . -+ die ("eval is not executable. The perl library " . $1 . " cannot be located.\n" . - "Please add the directory which contains " . $1 . " to the PERL5LIB environment variable, e.g. add the following line to your .bashrc file:\n\n" . - "export PERL5LIB=\$PERL5LIB:/path/to/" . $1 . "\n\n"); - } ---- a/auxprogs/joingenes/jg_transcript.cpp -+++ b/auxprogs/joingenes/jg_transcript.cpp -@@ -250,7 +250,7 @@ - } - - double simpleProkScore(Transcript const* tx){ -- // calculates a score for comparision; completeness shouldnt be used -+ // calculates a score for comparision; completeness shouldn't be used - if (tx->exon_list.size() != 1) - return 0; - else -@@ -938,7 +938,7 @@ - temp_exon_list.clear(); - switch (fittingCase){ - case 0: -- cerr << "WARNING: shouldnt happen (in joining())!" << endl; -+ cerr << "WARNING: shouldn't happen (in joining())!" << endl; - break; - case 1: - if (strand == '+'){ -@@ -1941,7 +1941,7 @@ - if (properties.warningCount[warningString] <= n){ - cerr << "WARNING: " << warning << endl; - if (properties.warningCount[warningString] == n){ -- cerr << "(This problem occured already " << n << " times and will not be printed further)..." << endl; -+ cerr << "(This problem occurred already " << n << " times and will not be printed further)..." << endl; - } - } - } -@@ -1949,7 +1949,7 @@ - void warningSummary(string const &warning, string const &warning2, Properties &properties, string warningString){ - if (properties.warningCount[warningString] == 0){return;} - if (warning.empty()){ -- cerr << "The " << warningString << " problem occured " << properties.warningCount[warningString] << " times." << endl; -+ cerr << "The " << warningString << " problem occurred " << properties.warningCount[warningString] << " times." << endl; - }else{ - cerr << warning << properties.warningCount[warningString] << warning2 << endl; - } ---- a/scripts/partition_gtf2gb.pl -+++ b/scripts/partition_gtf2gb.pl -@@ -147,7 +147,7 @@ - $_=~s/^>//; # remove the leading header sign - $seqName=$_; - if(defined($seq{$seqName})){ -- die("ERROR: the same sequence name occured twice in the genome file $fname!\n"); -+ die("ERROR: the same sequence name occurred twice in the genome file $fname!\n"); - } - }else{ - chomp $_; ---- a/scripts/simplifyFastaHeaders.pl -+++ b/scripts/simplifyFastaHeaders.pl -@@ -25,7 +25,7 @@ - while(<INPUT>){ - if(not($_=~m/\n$/)){ - if($wrongNL < 1){ -- print STDERR "Warning: something seems to be wrong with the newline character! This is likely to cause problems with the autoAug.pl pipeline and the AUGUSTUS web service! Please adapt your file to UTF8! This warning will be supressed from now on!\n"; -+ print STDERR "Warning: something seems to be wrong with the newline character! This is likely to cause problems with the autoAug.pl pipeline and the AUGUSTUS web service! Please adapt your file to UTF8! This warning will be suppressed from now on!\n"; - $wrongNL++; - } - } -@@ -51,7 +51,7 @@ - } - }else{ - if($emptyC < 1){ -- print STDERR "Warning: empty line was removed! This warning will supressed from now on!\n"; -+ print STDERR "Warning: empty line was removed! This warning will suppressed from now on!\n"; - } - $emptyC++; - } ---- a/src/consensus.cc -+++ b/src/consensus.cc -@@ -647,7 +647,7 @@ - cout<<max_line_len<<'\t'<<max_freq<<endl; - cout<< " The scale is "<< (float)max_line_len/max_freq <<" * = one occurence"<< endl; - if(starting==0) -- cout <<" and it starts from begining of sequence." <<endl; -+ cout <<" and it starts from beginning of sequence." <<endl; - else - cout <<" and it begins from position "<< starting <<"."<<endl; - for(j=0;j<max_string_length;j++){ ---- a/src/exon_seg.cc -+++ b/src/exon_seg.cc -@@ -377,11 +377,11 @@ - /* Initialize the vector to store the smooth data - */ - smooth_data.resize(input_set[0][0].size(),0.0); -- /* For the begining the code is written just to wrok on the -+ /* For the beginning the code is written just to wrok on the - * first track of the + strand only - */ - for(l=0;l<smooth_data.size();l++){// loop over position on track -- /* Dont change the values for the begining values and end values -+ /* Dont change the values for the beginning values and end values - * which cannot be covered by the window - */ - if(l<moving_window/2){ ---- a/src/geneMSA.cc -+++ b/src/geneMSA.cc -@@ -841,7 +841,7 @@ - void GeneMSA::computeOmegasEff(vector<AnnoSequence*> const &seqRanges, PhyloTree *ctree, ofstream *codonAli) { - cout<<"computing omega for each ortho exon."<<endl; - -- // treat forward and reverse strand seperately (might be done more efficiently) -+ // treat forward and reverse strand separately (might be done more efficiently) - for (int strnd=1; strnd>=0; strnd--){ - bool plusStrand = (bool) strnd; - if (plusStrand){ -@@ -1023,7 +1023,7 @@ - currRFnum = coit->second.size() - 1; - } - -- // store cumulative values at the begining of an OrthoExon -+ // store cumulative values at the beginning of an OrthoExon - cumValues cv = coit->second[currRFnum].second; - - aliPosIt->second.oeStart[i]->setOmega(&cv.logliks, codonevo, true); ---- a/src/introntrain.cc -+++ b/src/introntrain.cc -@@ -357,7 +357,7 @@ - cerr << e.getMessage() << endl; - } - if (numErrorSplicesites == 20) -- cerr << "further detailed output of splice site errors supressed." << endl; -+ cerr << "further detailed output of splice site errors suppressed." << endl; - } - } - in = in->next; ---- a/auxprogs/homGeneMapping/src/genome.cc -+++ b/auxprogs/homGeneMapping/src/genome.cc -@@ -294,7 +294,7 @@ - map<uint_fast64_t, vector< list< uint_fast64_t > > >::iterator it; - it = mappedPos.find(key); - if(it == mappedPos.end()) -- throw ProjectError("internal error: unkown SeqIntKey" + itoa(key) + " in genome " + name + "\n"); -+ throw ProjectError("internal error: unknown SeqIntKey" + itoa(key) + " in genome " + name + "\n"); - it->second[other.getIdx()].push_back(mapped.getKey()); - } - } -@@ -320,7 +320,7 @@ - - map<int,string>::const_iterator it = seqIDs.find(seqID); - if(it == seqIDs.end()) -- throw ProjectError("internal error: unkown sequence ID seqID=" + itoa(seqID) + " in genome " + name + "\n"); -+ throw ProjectError("internal error: unknown sequence ID seqID=" + itoa(seqID) + " in genome " + name + "\n"); - return it->second; - - } -@@ -425,7 +425,7 @@ - map<uint_fast64_t, vector< list< uint_fast64_t > > >::iterator it; - it = mappedPos.find(seqInt.getKey()); - if(it == mappedPos.end()) -- throw ProjectError("internal error: unkown SeqIntKey" + itoa(seqInt.getKey()) + " in genome " + name + "\n"); -+ throw ProjectError("internal error: unknown SeqIntKey" + itoa(seqInt.getKey()) + " in genome " + name + "\n"); - return it->second; - } - ---- a/auxprogs/joingenes/joingenes.cpp -+++ b/auxprogs/joingenes/joingenes.cpp -@@ -81,7 +81,7 @@ - cout << " Secondary program functions:" << endl; - cout << "\t--onlycompare\t\t\t-c\t\t\tis a flag." << endl; - cout << "\t\t\t\t\t\t\t\tIf this flag is set, it disables the normal function of the program and" << endl; -- cout << "\t\t\t\t\t\t\t\tactivates a compare and seperate mode to seperate equal transcripts from non equal ones." << endl; -+ cout << "\t\t\t\t\t\t\t\tactivates a compare and separate mode to separate equal transcripts from non equal ones." << endl; - cout << endl; - cout << " This help:" << endl; - cout << "\t--help \t\t\t\t-h\t\t\tprints the help documentation." << endl; ---- a/include/properties.hh -+++ b/include/properties.hh -@@ -118,7 +118,7 @@ - * methods, where TYPE is one of Int, Double, Bool or String. - * - * The format of the properties file is line based. Each line contains -- * the property name and the property value, seperated by whitespaces. -+ * the property name and the property value, separated by whitespaces. - * Comments begin with a '#' and end an the end of line. - * - * Example: Listing of a properties file diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 0000000..51cd4a9 --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,130 @@ +--- a/auxprogs/bam2hints/bam2hints.cc ++++ b/auxprogs/bam2hints/bam2hints.cc +@@ -541,7 +541,7 @@ + << " CACW21662.g1 3 C2 5TNS Unknown\n" + << " CACW25491.g1 3 F21 5TNS 3TNS-NP\n" + */ +- << " --maxgenelen=n -G alignments of the same clone are considered to be of the same gene if not separeted by more than this (set to " << MaxGeneLen << ")\n" ++ << " --maxgenelen=n -G alignments of the same clone are considered to be of the same gene if not separated by more than this (set to " << MaxGeneLen << ")\n" + << " Alignments that span more than this are ignored, but better filter long introns through an alignment program.\n" + << " --help -h show this help text\n" + << "\n"; +--- a/auxprogs/homGeneMapping/README.TXT ++++ b/auxprogs/homGeneMapping/README.TXT +@@ -66,7 +66,7 @@ + --halLiftover_exec_dir=DIR Directory that contains the executable halLiftover from the HAL Tools package + If not specified it must be in $PATH environment variable. + --tmpdir=DIR a temporary file directory that stores lifted over files. (default 'tmp/' in current directory) +---outdir=DIR file direcory that stores output gene files. (default: current directory) ++--outdir=DIR file directory that stores output gene files. (default: current directory) + + example: + homGeneMapping --noDupes --halLiftOver_exec_dir=~/tools/progressiveCactus/submodules/hal/bin --gtfs=gtffilenames.tbl --halfile=msca.hal +--- a/auxprogs/homGeneMapping/src/main.cc ++++ b/auxprogs/homGeneMapping/src/main.cc +@@ -293,7 +293,7 @@ + --unmapped print a GTF attribute with a list of all genomes, that are not aligned to the\n\ + corresponding gene feature, e.g. hgm_unmapped \"1,4,5\"; (default; off)\n\ + --tmpdir=DIR a temporary file directory that stores lifted over files. (default 'tmp/' in current directory)\n\ +---outdir=DIR file direcory that stores output gene files. (default: current directory)\n\ ++--outdir=DIR file directory that stores output gene files. (default: current directory)\n\ + --printHomologs=FILE prints disjunct sets of homologous transcripts to FILE, e.g.\n\ + # 0 dana\n\ + # 1 dere\n\ +--- a/mansrc/bam2hints.1 ++++ b/mansrc/bam2hints.1 +@@ -110,7 +110,7 @@ + .sp + \fB\-\-maxgenelen=n\fP/\fB\-G\fP + .RS 4 +-alignments of the same clone are considered to be of the same gene if not separeted by more than this (set to 400000). Alignments that span more than this are ignored, but better filter long introns through an alignment program. ++alignments of the same clone are considered to be of the same gene if not separated by more than this (set to 400000). Alignments that span more than this are ignored, but better filter long introns through an alignment program. + .RE + .SH "AUTHORS" + .sp +--- a/mansrc/bam2hints.1.adoc ++++ b/mansrc/bam2hints.1.adoc +@@ -63,7 +63,7 @@ + fill this number in in the score column (set to 0) + + *--maxgenelen=n*/*-G*:: +- alignments of the same clone are considered to be of the same gene if not separeted by more than this (set to 400000). Alignments that span more than this are ignored, but better filter long introns through an alignment program. ++ alignments of the same clone are considered to be of the same gene if not separated by more than this (set to 400000). Alignments that span more than this are ignored, but better filter long introns through an alignment program. + + ## AUTHORS + +--- a/mansrc/homGeneMapping.1 ++++ b/mansrc/homGeneMapping.1 +@@ -112,7 +112,7 @@ + .sp + \fB\-\-outdir=DIR\fP + .RS 4 +-file direcory that stores output gene files. (default: current directory) ++file directory that stores output gene files. (default: current directory) + .RE + .sp + \fB\-\-printHomologs=FILE\fP +--- a/mansrc/homGeneMapping.1.adoc ++++ b/mansrc/homGeneMapping.1.adoc +@@ -50,7 +50,7 @@ + a temporary file directory that stores lifted over files. (default 'tmp/' in current directory) + + *--outdir=DIR*:: +- file direcory that stores output gene files. (default: current directory) ++ file directory that stores output gene files. (default: current directory) + + *--printHomologs=FILE*:: + prints disjunct sets of homologous transcripts to FILE, e.g. +--- a/scripts/autoAugPred.pl ++++ b/scripts/autoAugPred.pl +@@ -470,7 +470,7 @@ + chdir "$workDir" or die ("Error: Could not change directory to $workDir. Please specify a valid one!\n"); + } + else{ +- die("Error: Missing working direcory!\n$usage"); ++ die("Error: Missing working directory!\n$usage"); + } + + if(-f "your_job.tmp"){ +--- a/scripts/blat2hints.pl ++++ b/scripts/blat2hints.pl +@@ -52,7 +52,7 @@ + $usage .= " CACW25491.g1 3 F21 5TNS 3TNS-NP\n"; + $usage .= " \n"; + $usage .= " cloneB\tread4\tread5\n"; +-$usage .= " --maxgenelen=n alignments of the same clone are considered to be of the same gene if not separeted by more than this (400000)\n"; ++$usage .= " --maxgenelen=n alignments of the same clone are considered to be of the same gene if not separated by more than this (400000)\n"; + $usage .= " Alignments that span more than this are ignored, but better filter long introns through alignment program.\n"; + + my $blatfilename; +--- a/src/motif.cc ++++ b/src/motif.cc +@@ -193,7 +193,7 @@ + // cout <<"Gewichtungsmatrix: \n" << weighingMatrix << endl; + istrm.close(); + } else { +- string errorMess("Could't open the file with the weight matrix: "); ++ string errorMess("Couldn't open the file with the weight matrix: "); + errorMess.append(matrixFileName); + throw ProjectError(errorMess.c_str()); + } +--- a/src/namgene.cc ++++ b/src/namgene.cc +@@ -1389,7 +1389,7 @@ + + istrm.close(); + } else { +- throw NAMGeneError( "Could't open the file with transition probabilities." ); ++ throw NAMGeneError( "Couldn't open the file with transition probabilities." ); + } + } + +@@ -1439,7 +1439,7 @@ + istrm >> Constant::tail2tail_ovlp[i]; + istrm.close(); + } else { +- throw NAMGeneError( "Could't open the file with the overlap length distribution." ); ++ throw NAMGeneError( "Couldn't open the file with the overlap length distribution." ); + } + } + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/augustus.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
