summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-05-04 23:13:01 +0200
committerBruno Haible <bruno@clisp.org>2023-05-04 23:13:10 +0200
commitfc7ca6923db3ab6787a5d3e261d47f8efdc0d3f0 (patch)
tree8011d3b026dfc05a80b3da790687a11dad47f47c
parent612d39b1be81b79c2531a82669457617a0dd73eb (diff)
downloadgnulib-fc7ca6923db3ab6787a5d3e261d47f8efdc0d3f0.tar.gz
c32to*: Relax license.
* modules/c32tolower (License): Change to LGPLv2+. * modules/c32toupper (License): Likewise. * lib/c32tolower.c: Update license notice. * lib/c32toupper.c: Likewise. * lib/c32to-impl.h: Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--lib/c32to-impl.h24
-rw-r--r--lib/c32tolower.c24
-rw-r--r--lib/c32toupper.c24
-rw-r--r--modules/c32tolower2
-rw-r--r--modules/c32toupper2
6 files changed, 33 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index aa6008053d..1517d331d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2023-05-04 Bruno Haible <bruno@clisp.org>
+ c32to*: Relax license.
+ * modules/c32tolower (License): Change to LGPLv2+.
+ * modules/c32toupper (License): Likewise.
+ * lib/c32tolower.c: Update license notice.
+ * lib/c32toupper.c: Likewise.
+ * lib/c32to-impl.h: Likewise.
+
unicase/tolower, unicase/toupper: Relax license.
* lib/gen-uni-tables.c (output_simple_mapping): Bump copyright year. For
unicase/tolower.h and unicase/toupper.h, use the LGPLv2+.
diff --git a/lib/c32to-impl.h b/lib/c32to-impl.h
index 724691a116..923825589b 100644
--- a/lib/c32to-impl.h
+++ b/lib/c32to-impl.h
@@ -1,26 +1,18 @@
/* Case mapping of 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/lib/c32tolower.c b/lib/c32tolower.c
index 447016214e..8934f6fe68 100644
--- a/lib/c32tolower.c
+++ b/lib/c32tolower.c
@@ -1,26 +1,18 @@
/* Map a 32-bit wide character to lowercase.
Copyright (C) 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/>. */
#include <config.h>
diff --git a/lib/c32toupper.c b/lib/c32toupper.c
index a3ca5ecf19..3fbe5d2ad2 100644
--- a/lib/c32toupper.c
+++ b/lib/c32toupper.c
@@ -1,26 +1,18 @@
/* Map a 32-bit wide character to uppercase.
Copyright (C) 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/>. */
#include <config.h>
diff --git a/modules/c32tolower b/modules/c32tolower
index b6ed633aec..601b013442 100644
--- a/modules/c32tolower
+++ b/modules/c32tolower
@@ -38,7 +38,7 @@ Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
License:
-LGPLv3+ or GPLv2+
+LGPLv2+
Maintainer:
Bruno Haible
diff --git a/modules/c32toupper b/modules/c32toupper
index 364e011818..54c79a6b36 100644
--- a/modules/c32toupper
+++ b/modules/c32toupper
@@ -38,7 +38,7 @@ Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
License:
-LGPLv3+ or GPLv2+
+LGPLv2+
Maintainer:
Bruno Haible