Skip to content

Commit aeafbf4

Browse files
committed
Rename to LICENSE
Previous bcftools releases and htslib & samtools releases all use LICENSE, so revert to that for continuity with previous releases. (The filename COPYING usually suggests plain GPL, and bcftools's situation is more complex than that.) See also 46b3c49. Reformat INSTALL paragraph to be readable on an 80-column terminal.
1 parent 8be96ab commit aeafbf4

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

INSTALL

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Note that GSL is distributed under a GPL license, so when USE_GPL=1 is used to
3030
compile bcftools, the resulting program must only be distributed under terms
3131
compatible with that license.
3232

33-
In the default compilation mode the program is dual licensed and you may choose
34-
to be licensed under the terms of the MIT/expat license or the GNU General Public
35-
License (GPL).
33+
In the default compilation mode the program is dual licensed and you may
34+
choose to be licensed under the terms of the MIT/Expat license or the
35+
GNU General Public License (GPL).
3636

3737

3838
Installation

COPYING LICENSE

File renamed without changes.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ INCLUDES = -I. -I$(HTSDIR)
4848

4949
# The polysomy command is not compiled by default because it brings dependency
5050
# on libgsl. The command can be compiled wth `make USE_GPL=1`. See the INSTALL
51-
# and COPYING documents to understand license implications.
51+
# and LICENSE documents to understand license implications.
5252
ifdef USE_GPL
5353
CFLAGS += -DUSE_GPL
5454
OBJS += polysomy.o

doc/bcftools.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -3239,4 +3239,4 @@ BCFtools documentation: http://samtools\&.github\&.io/bcftools
32393239
BCFtools wiki page: https://github\&.com/samtools/bcftools/wiki
32403240
.SH "COPYING"
32413241
.sp
3242-
The MIT/Expat License or GPL License, see the COPYING document for details\&. Copyright (c) Genome Research Ltd\&.
3242+
The MIT/Expat License or GPL License, see the LICENSE document for details\&. Copyright (c) Genome Research Ltd\&.

doc/bcftools.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1630,5 +1630,5 @@
16301630
BGZF library. Petr Danecek, Shane McCarthy and John Marshall are maintaining
16311631
and further developing bcftools. Many other people contributed to the program
16321632
and to the file format specifications, both directly and indirectly by
1633-
providing patches, testing and reporting bugs. We thank them all.</p></div><div class="refsect1" title="RESOURCES"><a id="_resources"></a><h2>RESOURCES</h2><p>BCFtools GitHub website: <a class="ulink" href="http://github.com/samtools/bcftools" target="_top">http://github.com/samtools/bcftools</a></p><p>Samtools GitHub website: <a class="ulink" href="http://github.com/samtools/samtools" target="_top">http://github.com/samtools/samtools</a></p><p>HTSlib GitHub website: <a class="ulink" href="http://github.com/samtools/htslib" target="_top">http://github.com/samtools/htslib</a></p><p>File format specifications: <a class="ulink" href="http://samtools.github.io/hts-specs" target="_top">http://samtools.github.io/hts-specs</a></p><p>BCFtools documentation: <a class="ulink" href="http://samtools.github.io/bcftools" target="_top">http://samtools.github.io/bcftools</a></p><p>BCFtools wiki page: <a class="ulink" href="https://github.com/samtools/bcftools/wiki" target="_top">https://github.com/samtools/bcftools/wiki</a></p></div><div class="refsect1" title="COPYING"><a id="_copying"></a><h2>COPYING</h2><p>The MIT/Expat License or GPL License, see the COPYING document for details.
1633+
providing patches, testing and reporting bugs. We thank them all.</p></div><div class="refsect1" title="RESOURCES"><a id="_resources"></a><h2>RESOURCES</h2><p>BCFtools GitHub website: <a class="ulink" href="http://github.com/samtools/bcftools" target="_top">http://github.com/samtools/bcftools</a></p><p>Samtools GitHub website: <a class="ulink" href="http://github.com/samtools/samtools" target="_top">http://github.com/samtools/samtools</a></p><p>HTSlib GitHub website: <a class="ulink" href="http://github.com/samtools/htslib" target="_top">http://github.com/samtools/htslib</a></p><p>File format specifications: <a class="ulink" href="http://samtools.github.io/hts-specs" target="_top">http://samtools.github.io/hts-specs</a></p><p>BCFtools documentation: <a class="ulink" href="http://samtools.github.io/bcftools" target="_top">http://samtools.github.io/bcftools</a></p><p>BCFtools wiki page: <a class="ulink" href="https://github.com/samtools/bcftools/wiki" target="_top">https://github.com/samtools/bcftools/wiki</a></p></div><div class="refsect1" title="COPYING"><a id="_copying"></a><h2>COPYING</h2><p>The MIT/Expat License or GPL License, see the LICENSE document for details.
16341634
Copyright (c) Genome Research Ltd.</p></div></div></body></html>

doc/bcftools.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1768,6 +1768,6 @@ BCFtools wiki page: <https://github.com/samtools/bcftools/wiki>
17681768

17691769
COPYING
17701770
-------
1771-
The MIT/Expat License or GPL License, see the COPYING document for details.
1771+
The MIT/Expat License or GPL License, see the LICENSE document for details.
17721772
Copyright (c) Genome Research Ltd.
17731773

0 commit comments

Comments
 (0)