Bjarni Ingi Gislason wrote:
> Module License File License File name
> ================= ============== =====================================
> LGPLv2+ LGPLv3+ or GPLv2+ lib/uniwidth/width0.h
> LGPLv2+ LGPLv3+ or GPLv2+ lib/uniwidth/width2.h
Fixed as follows. Thanks for the report.
2023-02-07 Bruno Haible <br...@clisp.org>
Fix a copyright header - module license mismatch.
Reported by Bjarni Ingi Gislason <bjarn...@simnet.is> in
<https://lists.gnu.org/archive/html/bug-gnulib/2023-02/msg00057.html>.
* lib/gen-uni-tables.c (output_predicate): For uniwidth/width2.h, use an
LGPLv2+ license.
(output_nonspacing_property): Use an LGPLv2+ license.
* lib/uniwidth/width0.h: Regenerated.
* lib/uniwidth/width2.h: Likewise.
diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c
index d783f21cb6..8b0efa9c44 100644
--- a/lib/gen-uni-tables.c
+++ b/lib/gen-uni-tables.c
@@ -773,7 +773,9 @@ output_predicate (const char *filename, bool (*predicate)
(unsigned int), const
fprintf (stream, "/* Copyright (C) 2000-2022 Free Software Foundation,
Inc.\n");
fprintf (stream, "\n");
- output_library_license (stream, strcmp (filename, "unictype/categ_M.h") ==
0);
+ output_library_license (stream,
+ strcmp (filename, "unictype/categ_M.h") == 0
+ || strcmp (filename, "uniwidth/width2.h") == 0);
fprintf (stream, "\n");
t.p = 4; /* or: 5 */
@@ -6422,7 +6424,7 @@ output_nonspacing_property (const char *filename, const
char *version)
fprintf (stream, "/* Copyright (C) 2000-2022 Free Software Foundation,
Inc.\n");
fprintf (stream, "\n");
- output_library_license (stream, false);
+ output_library_license (stream, true);
fprintf (stream, "\n");
next_ind = 0;
diff --git a/lib/uniwidth/width0.h b/lib/uniwidth/width0.h
index a4de856fc1..0c1713ac52 100644
--- a/lib/uniwidth/width0.h
+++ b/lib/uniwidth/width0.h
@@ -4,26 +4,18 @@
/* Copyright (C) 2000-2022 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/>. */
static const unsigned char nonspacing_table_data[48*64] = {
/* 0x0000-0x01ff */
diff --git a/lib/uniwidth/width2.h b/lib/uniwidth/width2.h
index 25a50e5683..19c8c02a51 100644
--- a/lib/uniwidth/width2.h
+++ b/lib/uniwidth/width2.h
@@ -4,26 +4,18 @@
/* Copyright (C) 2000-2022 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 header_0 16
#define header_2 9
