maint: consolidate licensing information to top-level directory

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/doc/COPYING b/COPYING
similarity index 100%
rename from doc/COPYING
rename to COPYING

diff --git a/doc/COPYING.LESSER b/COPYING.LESSERv2
similarity index 100%
rename from doc/COPYING.LESSER
rename to COPYING.LESSERv2

diff --git a/LICENSE b/LICENSE
deleted file mode 100644 (file)
index c751cef..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSING
-=========
-
-Since GnuTLS version 3.1.10, the core library is released under
-the GNU Lesser General Public License (LGPL) version 2.1 or later
-(see doc/COPYING.LESSER for the license terms).
-
-The GNU LGPL applies to the main GnuTLS library, while the
-included applications as well as gnutls-openssl 
-library are under the GNU GPL version 3.  The gnutls library is 
-located in the lib/ and libdane/ directories, while the applications
-in src/ and, the gnutls-openssl library is at extra/.
-
-The documentation in doc/ is under the GNU FDL license 1.3.
-
-
-Note, however, that the nettle and the gmp libraries which are
-GnuTLS dependencies, they are distributed under a LGPLv3+ or GPLv2+ dual
-license. As such binaries linking to them need to adhere to either LGPLv3+
-or the GPLv2+ license.
-
-For any copyright year range specified as YYYY-ZZZZ in this package
-note that the range specifies every single year in that closed interval.
-

diff --git a/Makefile.am b/Makefile.am
index 9ade7b6938001bd24fedccd962b63c6ea25f87c5..b59b9e1ffc43dc00a26466e5cc9410a92ebe7114 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ endif
 
 ACLOCAL_AMFLAGS = -I m4 -I src/gl/m4 -I lib/unistring/m4 --install
 
-EXTRA_DIST = cfg.mk maint.mk CONTRIBUTING.md README.md LICENSE AUTHORS NEWS \
+EXTRA_DIST = cfg.mk maint.mk CONTRIBUTING.md README.md COPYING.LESSERv2 COPYING AUTHORS NEWS \
        ChangeLog THANKS INSTALL.md RELEASES.md .mailmap
 
 DISTCLEANFILES = AUTHORS

diff --git a/README.md b/README.md
index a8d8b940e950c6f2067b5eed102b782452f677bf..f1f8b5ef58601f831f6896aa902600cadde79b3c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -178,6 +178,32 @@ phase is on every commit to gnutls project.
 The Travis based CI, is used to test compilation on MacOSX based systems.
 
 
+# Licensing
+
+The GnuTLS distribution consists of the main libraries (libgnutls and
+libdane, located in the lib/ and libdane/ directories), gnutls-openssl
+extra library (in the extra/ directory), applications (in the src/
+directory), tests (in the tests/ directory) and documentation.
+
+Since GnuTLS version 3.1.10, the main libraries are released under the
+GNU Lesser General Public License version 2.1 or later (LGPLv2+, see
+COPYING.LESSERv2 for the license terms), while the others are under
+the GNU General Public License version 3 or later (GPLv3+, see COPYING
+for the license terms), unless otherwise specified in the indivual
+source files.
+
+The documentation in the doc/ directory is under the GNU Free
+Documentation License version 1.3 or later (GFDLv1.3+).
+
+
+Note, however, that the nettle and the gmp libraries which are GnuTLS
+dependencies, are distributed under a LGPLv3+ or GPLv2+ dual
+license. As such binaries linking to them need to adhere to either
+LGPLv3+ or the GPLv2+ license.
+
+For any copyright year range specified as YYYY-ZZZZ in this package
+note that the range specifies every single year in that closed interval.
+
 # Contributing
 
 See [the contributing document](CONTRIBUTING.md).

diff --git a/doc/Makefile.am b/doc/Makefile.am
index af167489855d97629cd288ade2906d3e2b6da7b6..bd111fa11b6fb477f3e2e7f454910539885daf89 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,7 +21,7 @@
 EXTRA_DIST = TODO certtool.cfg gnutls.html     \
        doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css \
        stamp_enums stamp_functions \
-       doc.mk COPYING COPYING.LESSER
+       doc.mk
 
 IMAGES = \
        gnutls-handshake-state.png      \