This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository seqtools.
commit 829a73e7481ad17dc11a3ead9b9b9596f435fd00 Author: Andreas Tille <[email protected]> Date: Thu Oct 26 13:57:03 2017 +0200 Fix spelling --- debian/belvu.1 | 2 +- debian/blixem.1 | 4 +- debian/blixemh.1 | 4 +- debian/dotter.1 | 2 +- debian/patches/series | 1 + debian/patches/spelling.patch | 139 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 6 deletions(-) diff --git a/debian/belvu.1 b/debian/belvu.1 index 05df917..0acb6f9 100644 --- a/debian/belvu.1 +++ b/debian/belvu.1 @@ -146,7 +146,7 @@ BMC Bioinformatics 6:108 (2005) See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. .IP Copyright (c) 2011\-2015: Genome Research Ltd. -Belvu is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt +Belvu is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt .TP Version 4.44.1 14:27:56 Oct 19 2017 diff --git a/debian/blixem.1 b/debian/blixem.1 index e2b8084..6e552d7 100644 --- a/debian/blixem.1 +++ b/debian/blixem.1 @@ -10,7 +10,7 @@ Usage: blixem [options] [<sequence_file>] <data_file> [X options] .IP <sequence_file> contains the reference sequence in FASTA format. <data_file> is a GFF v3 file containing alignments and other features. -If <sequence_file> is ommitted, <data_file> should contain the reference +If <sequence_file> is omitted, <data_file> should contain the reference sequence in FASTA format, below a comment line that reads ##FASTA. .IP Both <sequence_file> and <data_file> can be substituted by "\-" @@ -170,7 +170,7 @@ Sequence Homology Analysis. Comput. Applic. Biosci. 10:301\-307. See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. .IP Copyright (c) 2009\-2015: Genome Research Ltd. -Blixem is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt +Blixem is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt .TP Version 4.44.1 14:27:56 Oct 19 2017 diff --git a/debian/blixemh.1 b/debian/blixemh.1 index 3a195cc..6a92e02 100644 --- a/debian/blixemh.1 +++ b/debian/blixemh.1 @@ -10,7 +10,7 @@ Usage: blixem [options] [<sequence_file>] <data_file> [X options] .IP <sequence_file> contains the reference sequence in FASTA format. <data_file> is a GFF v3 file containing alignments and other features. -If <sequence_file> is ommitted, <data_file> should contain the reference +If <sequence_file> is omitted, <data_file> should contain the reference sequence in FASTA format, below a comment line that reads ##FASTA. .IP Both <sequence_file> and <data_file> can be substituted by "\-" @@ -170,7 +170,7 @@ Sequence Homology Analysis. Comput. Applic. Biosci. 10:301\-307. See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. .IP Copyright (c) 2009\-2015: Genome Research Ltd. -Blixem is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt +Blixem is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt .TP Version 4.44.1 14:27:56 Oct 19 2017 diff --git a/debian/dotter.1 b/debian/dotter.1 index c83110f..57c7db0 100644 --- a/debian/dotter.1 +++ b/debian/dotter.1 @@ -140,7 +140,7 @@ sequence analysis. Gene 167(2):GC1\-10. See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. .IP Copyright (c) 2010\-2015: Genome Research Ltd. -Dotter is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt +Dotter is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt .TP Version 4.44.1 14:27:56 Oct 19 2017 diff --git a/debian/patches/series b/debian/patches/series index 61daa95..32c6ab5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ dynamic-lib.patch prevent_usage_of_blatsrc.patch use_debian_packaged_jsoncpp.patch fix_missing_includes.patch +spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 0000000..9e38f18 --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,139 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Thu, 19 Oct 2017 16:27:56 +0200 +Description: Fix spelling + +--- a/blixemApp/blxmain.cpp ++++ b/blixemApp/blxmain.cpp +@@ -65,7 +65,7 @@ gboolean blixem_debug_G = FALSE ; + \n\ + <sequence_file> contains the reference sequence in FASTA format.\n\ + <data_file> is a GFF v3 file containing alignments and other features.\n\ +- If <sequence_file> is ommitted, <data_file> should contain the reference\n\ ++ If <sequence_file> is omitted, <data_file> should contain the reference\n\ + sequence in FASTA format, below a comment line that reads ##FASTA.\n\ + \n\ + Both <sequence_file> and <data_file> can be substituted by \"-\"\n\ +@@ -202,7 +202,7 @@ gboolean blixem_debug_G = FALSE ; + + #define HELP_TEXT "\n\ + FEATURES\n\ +- The prefered file format for <datafile> is GFF v3. (However, Blixem is still compatible with\n\ ++ The preferred file format for <datafile> is GFF v3. (However, Blixem is still compatible with\n\ + older file formats such as exblx and seqbl, as used by MSPcrunch).\n\ + \n\ + Blixem is mainly aimed at displaying alignments, but can also show other features such as\n\ +--- a/doc/User_doc/belvu_usage.txt ++++ b/doc/User_doc/belvu_usage.txt +@@ -176,5 +176,5 @@ + See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. + + Copyright (c) 2011: Genome Research Ltd. +- Belvu is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt ++ Belvu is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt + +--- a/doc/User_doc/blixem_usage.txt ++++ b/doc/User_doc/blixem_usage.txt +@@ -4,7 +4,7 @@ + + <sequencefile> contains the reference sequence in FASTA format. + <datafile> is a GFF v3 file containing alignments and other features. +- If <sequencefile> is ommitted, <datafile> should contain the reference ++ If <sequencefile> is omitted, <datafile> should contain the reference + sequence in FASTA format, below a comment line that reads ##FASTA. + + Both <sequencefile> and <datafile> can be substituted by "-" +@@ -108,7 +108,7 @@ + + + FEATURES +- The prefered file format for <datafile> is GFF v3. (However, Blixem is still compatible with ++ The preferred file format for <datafile> is GFF v3. (However, Blixem is still compatible with + older file formats such as exblx and seqbl, as used by MSPcrunch). + + Blixem is mainly aimed at displaying alignments, but can also show other features such as +@@ -205,4 +205,4 @@ MSPcrunch + See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. + + Copyright (c) 2009-2011: Genome Research Ltd. +- Blixem is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt ++ Blixem is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt +--- a/doc/User_doc/dotter_usage.txt ++++ b/doc/User_doc/dotter_usage.txt +@@ -88,5 +88,5 @@ + See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. + + Copyright (c) 2010-2011: Genome Research Ltd. +- Dotter is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt ++ Dotter is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt + +--- a/seqtoolsUtils/version.hpp ++++ b/seqtoolsUtils/version.hpp +@@ -120,7 +120,7 @@ PACKAGE_NAME " - " VERSION_STRING + + /* Make a licence string */ + #define UT_MAKE_LICENCE_STRING(TITLE) \ +-TITLE" is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt"; ++TITLE" is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt"; + + + /* Define the authors of the SeqTools package. AUTHOR_LIST is a comma-separated list of all authors +--- a/test/scripts/automated/blixem/test1_results ++++ b/test/scripts/automated/blixem/test1_results +@@ -5,7 +5,7 @@ + + <sequencefile> contains the reference sequence in FASTA format. + <datafile> is a GFF v3 file containing alignments and other features. +- If <sequencefile> is ommitted, <datafile> should contain the reference ++ If <sequencefile> is omitted, <datafile> should contain the reference + sequence in FASTA format, below a comment line that reads ##FASTA. + + Both <sequencefile> and <datafile> can be substituted by "-" +@@ -109,7 +109,7 @@ + + + FEATURES +- The prefered file format for <datafile> is GFF v3. (However, Blixem is still compatible with ++ The preferred file format for <datafile> is GFF v3. (However, Blixem is still compatible with + older file formats such as exblx and seqbl, as used by MSPcrunch). + + Blixem is mainly aimed at displaying alignments, but can also show other features such as +@@ -201,7 +201,7 @@ To make the datafile from blast output, + See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. + + Copyright (c) 2009-2011: Genome Research Ltd. +- Blixem is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt ++ Blixem is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt + + Version 4.10-1-g6bff 17:38:25 Apr 4 2012 + +--- a/test/scripts/automated/blixem/test2_results ++++ b/test/scripts/automated/blixem/test2_results +@@ -5,7 +5,7 @@ + + <sequencefile> contains the reference sequence in FASTA format. + <datafile> is a GFF v3 file containing alignments and other features. +- If <sequencefile> is ommitted, <datafile> should contain the reference ++ If <sequencefile> is omitted, <datafile> should contain the reference + sequence in FASTA format, below a comment line that reads ##FASTA. + + Both <sequencefile> and <datafile> can be substituted by "-" +@@ -117,7 +117,7 @@ + See http://www.sanger.ac.uk/resources/software/seqtools/ for more info. + + Copyright (c) 2009-2011: Genome Research Ltd. +- Blixem is distributed under the GNU Public License; see http://www.gnu.org/copyleft/gpl.txt ++ Blixem is distributed under the GNU General Public License; see http://www.gnu.org/copyleft/gpl.txt + + Version 4.10-1-g6bff 17:38:25 Apr 4 2012 + +--- a/ChangeLog ++++ b/ChangeLog +@@ -14137,7 +14137,7 @@ + 5 files changed, 83 insertions(+), 20 deletions(-) + + 2010-04-13 gb10 <gb10> +- New blixem: make sure we don't find a non-monospace font in our prefered list of font families ++ New blixem: make sure we don't find a non-monospace font in our preferred list of font families + detailview.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqtools.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
