summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2021-05-30 14:50:16 +0200
committerBruno Haible <bruno@clisp.org>2021-05-30 14:50:16 +0200
commit87f797a50b854a4a2231203c25adbcec4f0dcd05 (patch)
treebc8fbeb373c009f5f40f8418190ff6ca098baa69
parentca45f9feb81f5c3eb8aeecb4902e3a828c216767 (diff)
downloadlibunistring-87f797a50b854a4a2231203c25adbcec4f0dcd05.tar.gz
Change license to LGPLv3+ or GPLv2+.
* README (Copyright): Adjust section. * doc/libunistring.texi (Licenses): Change accordingly. * NEWS: Mention the change.
-rw-r--r--ChangeLog7
-rw-r--r--NEWS1
-rw-r--r--README7
-rw-r--r--doc/libunistring.texi7
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c807132..1c1674a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-05-30 Bruno Haible <bruno@clisp.org>
+
+ Change license to LGPLv3+ or GPLv2+.
+ * README (Copyright): Adjust section.
+ * doc/libunistring.texi (Licenses): Change accordingly.
+ * NEWS: Mention the change.
+
2021-04-06 Bruno Haible <bruno@clisp.org>
build: Fix the set of exported symbols on Alpine Linux.
diff --git a/NEWS b/NEWS
index b2892b3..9276191 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
New in 0.9.11:
+* The license has changed from "LGPLv3+ or GPLv2" to "LGPLv3+ or GPLv2+".
* Fixed multithread-safety bugs on Cygwin, native Windows, and Haiku.
New in 0.9.10:
diff --git a/README b/README
index 47de6b0..eb21cff 100644
--- a/README
+++ b/README
@@ -46,11 +46,12 @@ Copyright
---------
The libunistring library and its header files are dual-licensed under
-"the GNU LGPLv3+ or the GNU GPLv2". This means, you can use it under either
+"the GNU LGPLv3+ or the GNU GPLv2+". This means, you can use it under either
- the terms of the GNU Lesser General Public License (LGPL) version 3 or
(at your option) any later version, or
- - the terms of the GNU General Public License (GPL) version 2, or
- - the same dual license "the GNU LGPLv3+ or the GNU GPLv2".
+ - the terms of the GNU General Public License (GPL) version 2 or
+ (at your option) any later version, or
+ - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
You find the GNU LGPL version 3 in the file COPYING.LIB. This license is
based on the GNU GPL version 3, see file COPYING.
diff --git a/doc/libunistring.texi b/doc/libunistring.texi
index b54f632..6b84b44 100644
--- a/doc/libunistring.texi
+++ b/doc/libunistring.texi
@@ -940,15 +940,16 @@ particular file or directory. Here is a summary:
@itemize @bullet
@item
The @code{libunistring} library and its header files are dual-licensed under
-"the GNU LGPLv3+ or the GNU GPLv2". This means, you can use it under either
+"the GNU LGPLv3+ or the GNU GPLv2+". This means, you can use it under either
@itemize @bullet
@item @minus{}
the terms of the GNU Lesser General Public License (LGPL) version 3 or
(at your option) any later version, or
@item @minus{}
-the terms of the GNU General Public License (GPL) version 2, or
+the terms of the GNU General Public License (GPL) version 2 or
+(at your option) any later version, or
@item @minus{}
-the same dual license "the GNU LGPLv3+ or the GNU GPLv2".
+the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
@end itemize
You find the GNU LGPL version 3 in @ref{GNU LGPL}. This license is
based on the GNU GPL version 3, see @ref{GNU GPL}.