diff options
author | Bruno Haible <bruno@clisp.org> | 2023-05-04 23:12:42 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2023-05-04 23:12:54 +0200 |
commit | 612d39b1be81b79c2531a82669457617a0dd73eb (patch) | |
tree | 99e7eef4995af37c402a561e855ec1db569d5699 /lib | |
parent | a8f70cc23836b9eb1f332f8e24d80fdb60e88d96 (diff) | |
download | gnulib-612d39b1be81b79c2531a82669457617a0dd73eb.tar.gz |
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.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gen-uni-tables.c | 6 | ||||
-rw-r--r-- | lib/unicase/simple-mapping.h | 24 | ||||
-rw-r--r-- | lib/unicase/tolower.c | 24 | ||||
-rw-r--r-- | lib/unicase/tolower.h | 26 | ||||
-rw-r--r-- | lib/unicase/toupper.c | 24 | ||||
-rw-r--r-- | lib/unicase/toupper.h | 26 |
6 files changed, 46 insertions, 84 deletions
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 |