summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-05-04 23:13:22 +0200
committerBruno Haible <bruno@clisp.org>2023-05-04 23:13:22 +0200
commitda9b464fbde795b9daaf0358ef089fa4b0ebae99 (patch)
tree4472cca062e410cf58c9100d25b3ee83d4aac0e6
parentfc7ca6923db3ab6787a5d3e261d47f8efdc0d3f0 (diff)
downloadgnulib-da9b464fbde795b9daaf0358ef089fa4b0ebae99.tar.gz
c32width: Relax license.
* modules/c32width (License): Change to LGPLv2+. * lib/c32width.c: Update license notice.
-rw-r--r--ChangeLog6
-rw-r--r--lib/c32width.c24
-rw-r--r--modules/c32width2
3 files changed, 15 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 1517d331d4..04e895792f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2023-05-04 Bruno Haible <bruno@clisp.org>
+ c32width: Relax license.
+ * modules/c32width (License): Change to LGPLv2+.
+ * lib/c32width.c: Update license notice.
+
+2023-05-04 Bruno Haible <bruno@clisp.org>
+
c32to*: Relax license.
* modules/c32tolower (License): Change to LGPLv2+.
* modules/c32toupper (License): Likewise.
diff --git a/lib/c32width.c b/lib/c32width.c
index 4149e06b25..76371ac741 100644
--- a/lib/c32width.c
+++ b/lib/c32width.c
@@ -1,26 +1,18 @@
/* Determine the number of screen columns needed for a 32-bit wide character.
Copyright (C) 2020-2023 Free Software Foundation, Inc.
- This file is free software.
- It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
- You can redistribute it and/or modify it under either
- - the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation, either version 3, or (at your
- option) any later version, or
- - the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option)
- any later version, or
- - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
+ This file is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License and the GNU General Public License
- for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License and of the GNU General Public License along with this
- program. If not, see <https://www.gnu.org/licenses/>. */
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2023. */
diff --git a/modules/c32width b/modules/c32width
index f91e67f37f..22c38841a9 100644
--- a/modules/c32width
+++ b/modules/c32width
@@ -35,7 +35,7 @@ Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
License:
-LGPLv3+ or GPLv2+
+LGPLv2+
Maintainer:
Bruno Haible