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+.
* lib/unicase/tolower.h: Regenerated.
* lib/unicase/toupper.h: Likewise.
* lib/unicase/simple-mapping.h: Update license notice.
* lib/unicase/tolower.c: Likewise.
* lib/unicase/toupper.c: Likewise.
* modules/unicase/tolower (License): Change to LGPLv2+.
* modules/unicase/toupper (License): Likewise.

9 files changed, 59 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index 787086bae1..aa6008053d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2023-05-04  Bruno Haible  <bruno@clisp.org>
 
+	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+.
+	* lib/unicase/tolower.h: Regenerated.
+	* lib/unicase/toupper.h: Likewise.
+	* lib/unicase/simple-mapping.h: Update license notice.
+	* lib/unicase/tolower.c: Likewise.
+	* lib/unicase/toupper.c: Likewise.
+	* modules/unicase/tolower (License): Change to LGPLv2+.
+	* modules/unicase/toupper (License): Likewise.
+
 	unicase/base: Relax license.
 	* modules/unicase/base (License): Change to LGPLv2+.
 	* lib/unicase.in.h: Update license notice.
diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c
index 29005ebdc5..0dceedc06c 100644
--- a/lib/gen-uni-tables.c
+++ b/lib/gen-uni-tables.c
@@ -10254,9 +10254,11 @@ output_simple_mapping (const char *filename,
            version);
   fprintf (stream, "\n");
 
-  fprintf (stream, "/* Copyright (C) 2000-2022 Free Software Foundation, Inc.\n");
+  fprintf (stream, "/* Copyright (C) 2000-2023 Free Software Foundation, Inc.\n");
   fprintf (stream, "\n");
-  output_library_license (stream, false);
+  output_library_license (stream,
+                          strcmp (filename, "unicase/tolower.h") == 0
+                          || strcmp (filename, "unicase/toupper.h") == 0);
   fprintf (stream, "\n");
 
   t.p = 7;
diff --git a/lib/unicase/simple-mapping.h b/lib/unicase/simple-mapping.h
index 6a36089d7b..6b44fc2e87 100644
--- a/lib/unicase/simple-mapping.h
+++ b/lib/unicase/simple-mapping.h
@@ -2,26 +2,18 @@
    Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   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/>.  */
 
 ucs4_t
 FUNC (ucs4_t uc)
diff --git a/lib/unicase/tolower.c b/lib/unicase/tolower.c
index f92519a3ac..8c8efa55e6 100644
--- a/lib/unicase/tolower.c
+++ b/lib/unicase/tolower.c
@@ -2,26 +2,18 @@
    Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   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/unicase/tolower.h b/lib/unicase/tolower.h
index 607128c229..6fa031c911 100644
--- a/lib/unicase/tolower.h
+++ b/lib/unicase/tolower.h
@@ -2,28 +2,20 @@
 /* Simple character mapping of Unicode characters.  */
 /* Generated automatically by gen-uni-tables.c for Unicode 15.0.0.  */
 
-/* Copyright (C) 2000-2022 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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/>.  */
 
 #define mapping_header_0 16
 #define mapping_header_1 2
diff --git a/lib/unicase/toupper.c b/lib/unicase/toupper.c
index 7d055df8f2..82c58ae4dd 100644
--- a/lib/unicase/toupper.c
+++ b/lib/unicase/toupper.c
@@ -2,26 +2,18 @@
    Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   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/unicase/toupper.h b/lib/unicase/toupper.h
index bcca404376..c460ee2a81 100644
--- a/lib/unicase/toupper.h
+++ b/lib/unicase/toupper.h
@@ -2,28 +2,20 @@
 /* Simple character mapping of Unicode characters.  */
 /* Generated automatically by gen-uni-tables.c for Unicode 15.0.0.  */
 
-/* Copyright (C) 2000-2022 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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/>.  */
 
 #define mapping_header_0 16
 #define mapping_header_1 2
diff --git a/modules/unicase/tolower b/modules/unicase/tolower
index 732e8e7f31..e860d21383 100644
--- a/modules/unicase/tolower
+++ b/modules/unicase/tolower
@@ -21,7 +21,7 @@ Include:
 "unicase.h"
 
 License:
-LGPLv3+ or GPLv2+
+LGPLv2+
 
 Maintainer:
 all
diff --git a/modules/unicase/toupper b/modules/unicase/toupper
index d1fb7bd8b1..0a8e3eb4b8 100644
--- a/modules/unicase/toupper
+++ b/modules/unicase/toupper
@@ -21,7 +21,7 @@ Include:
 "unicase.h"
 
 License:
-LGPLv3+ or GPLv2+
+LGPLv2+
 
 Maintainer:
 all