These 3 modules will soon be dependencies of 'fnmatch', and therefore have
to be under LGPLv2+ license. I'm the sole author of these *.[ch] files, so
I relicense them.


2023-07-23  Bruno Haible  <[email protected]>

        unistr/u32-strcat: Relicense under LGPLv2+.
        * modules/unistr/u32-strcat (License): Change to LGPLv2+.
        * lib/unistr/u32-strcat.c: Update license notice.
        * lib/unistr/u-strcat.h: Likewise.

2023-07-23  Bruno Haible  <[email protected]>

        unistr/u32-strlen: Relicense under LGPLv2+.
        * modules/unistr/u32-strlen (License): Change to LGPLv2+.
        * lib/unistr/u32-strlen.c: Update license notice.

2023-07-23  Bruno Haible  <[email protected]>

        unistr/u32-chr: Relicense under LGPLv2+.
        * modules/unistr/u32-chr (License): Change to LGPLv2+.
        * lib/unistr/u32-chr.c: Update license notice.

>From 742cca37017db97d02fb10027c7313635e9cc9da Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email protected]>
Date: Mon, 24 Jul 2023 01:49:27 +0200
Subject: [PATCH 1/3] unistr/u32-chr: Relicense under LGPLv2+.

* modules/unistr/u32-chr (License): Change to LGPLv2+.
* lib/unistr/u32-chr.c: Update license notice.
---
 ChangeLog              |  6 ++++++
 lib/unistr/u32-chr.c   | 24 ++++++++----------------
 modules/unistr/u32-chr |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1cbfe0638..0aa8f2ff76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-07-23  Bruno Haible  <[email protected]>
+
+	unistr/u32-chr: Relicense under LGPLv2+.
+	* modules/unistr/u32-chr (License): Change to LGPLv2+.
+	* lib/unistr/u32-chr.c: Update license notice.
+
 2023-07-23  Bruno Haible  <[email protected]>
 
 	fnmatch tests: Avoid a test failure on FreeBSD.
diff --git a/lib/unistr/u32-chr.c b/lib/unistr/u32-chr.c
index 46dc95320f..ac99cad928 100644
--- a/lib/unistr/u32-chr.c
+++ b/lib/unistr/u32-chr.c
@@ -2,26 +2,18 @@
    Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2002.
 
-   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/modules/unistr/u32-chr b/modules/unistr/u32-chr
index 3612afb0ca..38fe9017a8 100644
--- a/modules/unistr/u32-chr
+++ b/modules/unistr/u32-chr
@@ -19,7 +19,7 @@ Include:
 "unistr.h"
 
 License:
-LGPLv3+ or GPLv2+
+LGPLv2+
 
 Maintainer:
 all
-- 
2.34.1

>From 2ef67cbfbc25fb8154d68b43175811977ee9018a Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email protected]>
Date: Mon, 24 Jul 2023 01:51:15 +0200
Subject: [PATCH 2/3] unistr/u32-strlen: Relicense under LGPLv2+.

* modules/unistr/u32-strlen (License): Change to LGPLv2+.
* lib/unistr/u32-strlen.c: Update license notice.
---
 ChangeLog                 |  6 ++++++
 lib/unistr/u32-strlen.c   | 24 ++++++++----------------
 modules/unistr/u32-strlen |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0aa8f2ff76..5f24d01c98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-07-23  Bruno Haible  <[email protected]>
+
+	unistr/u32-strlen: Relicense under LGPLv2+.
+	* modules/unistr/u32-strlen (License): Change to LGPLv2+.
+	* lib/unistr/u32-strlen.c: Update license notice.
+
 2023-07-23  Bruno Haible  <[email protected]>
 
 	unistr/u32-chr: Relicense under LGPLv2+.
diff --git a/lib/unistr/u32-strlen.c b/lib/unistr/u32-strlen.c
index bf0ad7a217..6e31d8e570 100644
--- a/lib/unistr/u32-strlen.c
+++ b/lib/unistr/u32-strlen.c
@@ -2,26 +2,18 @@
    Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2002.
 
-   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/modules/unistr/u32-strlen b/modules/unistr/u32-strlen
index f8a9ccf96f..e6b11c2dc3 100644
--- a/modules/unistr/u32-strlen
+++ b/modules/unistr/u32-strlen
@@ -20,7 +20,7 @@ Include:
 "unistr.h"
 
 License:
-LGPLv3+ or GPLv2+
+LGPLv2+
 
 Maintainer:
 all
-- 
2.34.1

>From a5db928af7521de5a259f4a9b3cc49839431ddc1 Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email protected]>
Date: Mon, 24 Jul 2023 01:53:33 +0200
Subject: [PATCH 3/3] unistr/u32-strcat: Relicense under LGPLv2+.

* modules/unistr/u32-strcat (License): Change to LGPLv2+.
* lib/unistr/u32-strcat.c: Update license notice.
* lib/unistr/u-strcat.h: Likewise.
---
 ChangeLog                 |  7 +++++++
 lib/unistr/u-strcat.h     | 24 ++++++++----------------
 lib/unistr/u32-strcat.c   | 24 ++++++++----------------
 modules/unistr/u32-strcat |  2 +-
 4 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f24d01c98..c4d5a78879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-07-23  Bruno Haible  <[email protected]>
+
+	unistr/u32-strcat: Relicense under LGPLv2+.
+	* modules/unistr/u32-strcat (License): Change to LGPLv2+.
+	* lib/unistr/u32-strcat.c: Update license notice.
+	* lib/unistr/u-strcat.h: Likewise.
+
 2023-07-23  Bruno Haible  <[email protected]>
 
 	unistr/u32-strlen: Relicense under LGPLv2+.
diff --git a/lib/unistr/u-strcat.h b/lib/unistr/u-strcat.h
index 608272220a..ff2afe6a6e 100644
--- a/lib/unistr/u-strcat.h
+++ b/lib/unistr/u-strcat.h
@@ -2,26 +2,18 @@
    Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2002.
 
-   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/>.  */
 
 UNIT *
 FUNC (UNIT *dest, const UNIT *src)
diff --git a/lib/unistr/u32-strcat.c b/lib/unistr/u32-strcat.c
index ca99327696..911c57a75b 100644
--- a/lib/unistr/u32-strcat.c
+++ b/lib/unistr/u32-strcat.c
@@ -2,26 +2,18 @@
    Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2002.
 
-   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/modules/unistr/u32-strcat b/modules/unistr/u32-strcat
index aa8d8827b1..07775a6b91 100644
--- a/modules/unistr/u32-strcat
+++ b/modules/unistr/u32-strcat
@@ -21,7 +21,7 @@ Include:
 "unistr.h"
 
 License:
-LGPLv3+ or GPLv2+
+LGPLv2+
 
 Maintainer:
 all
-- 
2.34.1

Reply via email to