diff options
author | Bruno Haible <bruno@clisp.org> | 2021-12-07 16:12:37 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2021-12-07 16:12:37 +0100 |
commit | d61bca14edc031e824fe30bcad577da145842d50 (patch) | |
tree | d9eda93845ba3e2c43e1a307ba556125885a8e4e | |
parent | 36eeafa7eda88ed751bedbd7a72f91509eef8de1 (diff) | |
download | libunistring-d61bca14edc031e824fe30bcad577da145842d50.tar.gz |
Fix some license headers.
Reported by Dylan Aïssi <daissi@debian.org> at
<https://savannah.gnu.org/bugs/?61459>.
* lib/version.c: Change license header to LGPLv3+ or GPLv2+.
* lib/unistring-notinline.h: Likewise.
* lib/unistring/cdefs.h: Likewise.
* lib/unistring/inline.h: Likewise.
* lib/unistring/version.in.h: Likewise.
* lib/unistring/woe32dll.in.h: Likewise.
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | lib/unistring-notinline.h | 21 | ||||
-rw-r--r-- | lib/unistring/cdefs.h | 21 | ||||
-rw-r--r-- | lib/unistring/inline.h | 21 | ||||
-rw-r--r-- | lib/unistring/version.in.h | 21 | ||||
-rw-r--r-- | lib/unistring/woe32dll.in.h | 21 | ||||
-rw-r--r-- | lib/version.c | 21 |
7 files changed, 102 insertions, 36 deletions
@@ -1,3 +1,15 @@ +2021-12-07 Bruno Haible <bruno@clisp.org> + + Fix some license headers. + Reported by Dylan Aïssi <daissi@debian.org> at + <https://savannah.gnu.org/bugs/?61459>. + * lib/version.c: Change license header to LGPLv3+ or GPLv2+. + * lib/unistring-notinline.h: Likewise. + * lib/unistring/cdefs.h: Likewise. + * lib/unistring/inline.h: Likewise. + * lib/unistring/version.in.h: Likewise. + * lib/unistring/woe32dll.in.h: Likewise. + 2021-08-07 Bruno Haible <bruno@clisp.org> Make gl_INIT_PACKAGE work with Automake >= 1.16.4. diff --git a/lib/unistring-notinline.h b/lib/unistring-notinline.h index 1fc8be0..59ebc63 100644 --- a/lib/unistring-notinline.h +++ b/lib/unistring-notinline.h @@ -1,15 +1,24 @@ /* Override decision whether to use 'inline' or not. Copyright (C) 2009 Free Software Foundation, Inc. - This program 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 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. 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 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 along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/lib/unistring/cdefs.h b/lib/unistring/cdefs.h index 3650f54..3faf5ba 100644 --- a/lib/unistring/cdefs.h +++ b/lib/unistring/cdefs.h @@ -1,15 +1,24 @@ /* Common macro definitions for C include files. Copyright (C) 2008-2021 Free Software Foundation, Inc. - This program 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 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. 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 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 along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/lib/unistring/inline.h b/lib/unistring/inline.h index a6c8985..4605fbf 100644 --- a/lib/unistring/inline.h +++ b/lib/unistring/inline.h @@ -1,15 +1,24 @@ /* Decision whether to use 'inline' or not. Copyright (C) 2006, 2009, 2018 Free Software Foundation, Inc. - This program 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 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. 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 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 along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/lib/unistring/version.in.h b/lib/unistring/version.in.h index 0e588ef..d35adc6 100644 --- a/lib/unistring/version.in.h +++ b/lib/unistring/version.in.h @@ -2,15 +2,24 @@ Copyright (C) 2009-2010 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. - This program 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 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. 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 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 along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/lib/unistring/woe32dll.in.h b/lib/unistring/woe32dll.in.h index 19df687..6f5b9d8 100644 --- a/lib/unistring/woe32dll.in.h +++ b/lib/unistring/woe32dll.in.h @@ -1,15 +1,24 @@ /* Support for variables in shared libraries on Windows platforms. Copyright (C) 2009 Free Software Foundation, Inc. - This program 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 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. 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 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 along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/lib/version.c b/lib/version.c index a2f2f2d..3036509 100644 --- a/lib/version.c +++ b/lib/version.c @@ -2,15 +2,24 @@ Copyright (C) 2009 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. - This program 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 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. 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 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 along with this program. If not, see <https://www.gnu.org/licenses/>. */ |