>From 80b4ecc452f9a6cafa38702e465bf25d7c27c5de Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 4 Jun 2021 20:55:44 +0200 Subject: [PATCH 4/8] Generate correct license notices in libunistring files. * lib/uniname/gen-uninames.lisp (main): Emit a copyright and license notice. * lib/uniname/uninames.h: Regenerated. --- ChangeLog | 7 +++++++ lib/uniname/gen-uninames.lisp | 46 +++++++++++++++++++++++++++++++++++-------- lib/uniname/uninames.h | 22 +++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79aabfb..7706351 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2021-06-04 Bruno Haible + Generate correct license notices in libunistring files. + * lib/uniname/gen-uninames.lisp (main): Emit a copyright and license + notice. + * lib/uniname/uninames.h: Regenerated. + +2021-06-04 Bruno Haible + Put LGPLv2+ notices in source files where appropriate. * lib/**.{h,c,gperf}: Use LGPLv2+ notice whenever the module description says so. diff --git a/lib/uniname/gen-uninames.lisp b/lib/uniname/gen-uninames.lisp index 86cc2f7..e34ef19 100755 --- a/lib/uniname/gen-uninames.lisp +++ b/lib/uniname/gen-uninames.lisp @@ -5,18 +5,26 @@ ;;; Copyright (C) 2000-2021 Free Software Foundation, Inc. ;;; Written by Bruno Haible , 2000-12-28. ;;; -;;; This program is free software: you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or -;;; (at your option) any later version. +;;; This program 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 program 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 General Public License for more details. +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; Lesser General Public License and the GNU General Public License +;;; for more details. ;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . +;;; 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 . (defparameter add-comments nil) @@ -166,6 +174,28 @@ (format ostream " * Unicode character name table.~%") (format ostream " * Generated automatically by the gen-uninames utility.~%") (format ostream " */~%") + (format ostream "/* Copyright (C) 2000-2021 Free Software Foundation, Inc.~%") + (format ostream "~%") + (format ostream " This program is free software.~%") + (format ostream " It is dual-licensed under \"the GNU LGPLv3+ or the GNU GPLv2+\".~%") + (format ostream " You can redistribute it and/or modify it under either~%") + (format ostream " - the terms of the GNU Lesser General Public License as published~%") + (format ostream " by the Free Software Foundation; either version 3, or (at your~%") + (format ostream " option) any later version, or~%") + (format ostream " - the terms of the GNU General Public License as published by the~%") + (format ostream " Free Software Foundation; either version 2, or (at your option)~%") + (format ostream " any later version, or~%") + (format ostream " - the same dual license \"the GNU LGPLv3+ or the GNU GPLv2+\".~%") + (format ostream "~%") + (format ostream " This program is distributed in the hope that it will be useful,~%") + (format ostream " but WITHOUT ANY WARRANTY; without even the implied warranty of~%") + (format ostream " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU~%") + (format ostream " Lesser General Public License and the GNU General Public License~%") + (format ostream " for more details.~%") + (format ostream "~%") + (format ostream " You should have received a copy of the GNU Lesser General Public~%") + (format ostream " License and of the GNU General Public License along with this~%") + (format ostream " program. If not, see . */~%") (format ostream "~%") (format ostream "static const char unicode_name_words[~D] = {~%" (let ((sum 0)) diff --git a/lib/uniname/uninames.h b/lib/uniname/uninames.h index 191b353..3203c66 100644 --- a/lib/uniname/uninames.h +++ b/lib/uniname/uninames.h @@ -5,6 +5,28 @@ * Unicode character name table. * Generated automatically by the gen-uninames utility. */ +/* Copyright (C) 2000-2021 Free Software Foundation, Inc. + + This program 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 program 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. + + 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 . */ static const char unicode_name_words[71408] = { 'A', -- 2.7.4