kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

Merge branch 'spdx' into 'master'

Browse Source 
docs: switch to spdx license list

See merge request !194
This commit is contained in:
Daniel Martí 2017-01-01 23:24:37 +00:00
commit 4c4ad2ebfc
1 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
docs/fdroid.texi
View File

@ -16,7 +16,7 @@ Copyright @copyright{} 2013 David Black
Copyright @copyright{} 2013, 2014, 2015 Daniel Martí
Copyright @copyright{} 2015 Boris Kraut
Copyright @copyright{} 2015, 2016 Boris Kraut
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -586,55 +586,9 @@ This is converted to (@code{<email>}) in the public index file.
@cindex license
The overall license for the application, or in certain cases, for the
source code only.
Common values:
@itemize @bullet
@item
@samp{GPLv2}
GNU GPL version 2
@item
@samp{GPLv2+}
GNU GPL version 2 or later
@item
@samp{GPLv3}
GNU GPL version 3
@item
@samp{GPLv3+}
GNU GPL version 3 or later
@item
@samp{GPL}
An unspecified GPL version. Use this only as a last resort or if there is
some confusion over compatiblity of component licenses: particularly the use of
Apache libraries with GPLv2 source code.
@item
@samp{AGPL}
Afferro GPL version 3.
@item
@samp{Apache2}
Apache 2
@item
@samp{MIT}
MIT X11 license
@item
@samp{BSD}
BSD license - the original '4-clause' version.
@item
@samp{NewBSD}
BSD license - the new, or modified, version.
@end itemize
source code only. Values should correspond to short identifiers of the
@uref{https://spdx.org/licenses/, SPDX} license list. In some cases an
older, non-standard naming scheme is still used.
This is converted to (@code{<license>}) in the public index file.