From 13b42a79bbab8acb1fa8d1bf2ebef9e7d929967d Mon Sep 17 00:00:00 2001
From: mira prosovetskaia <mira@ebi.ac.uk>
Date: Mon, 25 Jan 2021 15:16:01 +0000
Subject: [PATCH] Update licese in some doc files, GPL to Apache
---
src/doc/User_doc/belvu_usage.txt | 2 +-
src/doc/User_doc/blixem_usage.txt | 2 +-
src/doc/User_doc/dotter_usage.txt | 2 +-
src/seqtoolsUtils/version.hpp | 2 +-
src/test/scripts/automated/blixem/test1_results | 2 +-
src/test/scripts/automated/blixem/test2_results | 7 +++----
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/doc/User_doc/belvu_usage.txt b/src/doc/User_doc/belvu_usage.txt
index fbe0a5a4..e6909cf2 100644
--- a/src/doc/User_doc/belvu_usage.txt
+++ b/src/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 Apache License; see http://www.gnu.org/copyleft/gpl.txt
diff --git a/src/doc/User_doc/blixem_usage.txt b/src/doc/User_doc/blixem_usage.txt
index e26a0d9b..b1f78ee0 100644
--- a/src/doc/User_doc/blixem_usage.txt
+++ b/src/doc/User_doc/blixem_usage.txt
@@ -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 Apache License; see http://www.gnu.org/copyleft/gpl.txt
diff --git a/src/doc/User_doc/dotter_usage.txt b/src/doc/User_doc/dotter_usage.txt
index eaab80d4..f672a3d0 100644
--- a/src/doc/User_doc/dotter_usage.txt
+++ b/src/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 Apache License; see http://www.gnu.org/copyleft/gpl.txt
diff --git a/src/seqtoolsUtils/version.hpp b/src/seqtoolsUtils/version.hpp
index 51cf7dfa..b629c4a0 100755
--- a/src/seqtoolsUtils/version.hpp
+++ b/src/seqtoolsUtils/version.hpp
@@ -121,7 +121,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 Apache 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
diff --git a/src/test/scripts/automated/blixem/test1_results b/src/test/scripts/automated/blixem/test1_results
index 795fdc9d..780da03a 100644
--- a/src/test/scripts/automated/blixem/test1_results
+++ b/src/test/scripts/automated/blixem/test1_results
@@ -201,7 +201,7 @@ To make the datafile from blast output, run MSPcrunch with option -q.
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 Apache License; see http://www.gnu.org/copyleft/gpl.txt
Version 4.10-1-g6bff 17:38:25 Apr 4 2012
diff --git a/src/test/scripts/automated/blixem/test2_results b/src/test/scripts/automated/blixem/test2_results
index b516f5a9..7674d01c 100644
--- a/src/test/scripts/automated/blixem/test2_results
+++ b/src/test/scripts/automated/blixem/test2_results
@@ -1,7 +1,7 @@
Blixem - display multiple alignments against a reference sequence.
- Usage: blixem [options] [<sequencefile>] <datafile> [X options]
+ Usage: blixem [options] [<sequencefile>] <datafile> [X options]
<sequencefile> contains the reference sequence in FASTA format.
<datafile> is a GFF v3 file containing alignments and other features.
@@ -109,7 +109,7 @@
-----
Written by Gemma Barson <gb10@sanger.ac.uk>
- Based on original code by Erik Sonnhammer <Erik.Sonnhammer@sbc.su.se>
+ Based on original code by Erik Sonnhammer <Erik.Sonnhammer@sbc.su.se>
Reference: Sonnhammer ELL & Durbin R (1994). A workbench for Large Scale
Sequence Homology Analysis. Comput. Applic. Biosci. 10:301-307.
@@ -117,7 +117,6 @@
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 Apache License;
Version 4.10-1-g6bff 17:38:25 Apr 4 2012
-
--
GitLab