Four files to remain LGPL but change to v3.

jonnysoe · Aug 1, 2018 · 959e1c1 · 959e1c1
1 parent 98bba9a
commit 959e1c1
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 103 deletions.
diff --git a/ANNOUNCE b/ANNOUNCE
@@ -17,18 +17,23 @@ Some common non-portable functions are also implemented for
 additional compatibility, as are a few functions specific
 to pthreads4w for easier integration with Windows applications.
 
-Pthreads4w is free software. Version 3.0.0 is distributed under the
-Apache License version 2.0 (APLv2). The APLv2 is compatible with the GPLv3
-and LGPLv3 licenses and therefore this code may continue to be legally
-included within GPLv3 and LGPLv3 projects.
+Pthreads4w is free software. With the exception of four files noted later,
+Version 3.0.0 is distributed under the Apache License version 2.0 (APLv2).
+The APLv2 is compatible with the GPLv3 and LGPLv3 licenses and therefore
+this code may continue to be legally included within GPLv3 and LGPLv3
+projects.
 
 All version 1 and 2 releases will remain LGPL but version 2.11 will be
 released under v3 of that license so that any modifications to pthreads4w
 version 3 code that we backport to v2 will not pollute that code.
 
-Because this license compatibility is not reciprocal, future
-modifications to pthreads4w will only be accepted to version 3 (or
-later), i.e. the APLv2 code-base.
+The four files that will remain LGPL but change to v3 are files used to
+configure the GNU environment builds:
+
+	aclocal.m4
+	configure.ac
+	GNUmakefile.in
+	tests/GNUmakefile.in
 
 For those who want to try the most recent changes, the SourceForge Git
 repository is the one to use. The Sourceware CVS repository is synchronised

diff --git a/GNUmakefile.in b/GNUmakefile.in
@@ -1,30 +1,33 @@
 # @configure_input@
 # --------------------------------------------------------------------------
 #
- *      Pthreads4w - POSIX Threads for Windows
- *      Copyright 1998 John E. Bossom
- *      Copyright 1999-2016, Pthreads4w contributors
- *
- *      Homepage: https://sourceforge.net/projects/pthreads4w/
- *
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *
- *      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+#      Pthreads4w - POSIX Threads for Windows
+#      Copyright 1998 John E. Bossom
+#      Copyright 1999-2016, Pthreads4w contributors
+#
+#      Homepage: https://sourceforge.net/projects/pthreads4w/
+#
+#      The current list of contributors is contained
+#      in the file CONTRIBUTORS included with the source
+#      code distribution. The list can also be seen at the
+#      following World Wide Web location:
+#
+#      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
+#
+#      This library 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 library 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.
+# 
+#      You should have received a copy of the GNU Lesser General Public
+#      License along with this library in the file COPYING.LIB;
+#      if not, write to the Free Software Foundation, Inc.,
+#      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 PACKAGE = @PACKAGE_TARNAME@
 VERSION = @PACKAGE_VERSION@

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,30 +1,33 @@
 ## aclocal.m4
 ## --------------------------------------------------------------------------
 ##
- *      Pthreads4w - POSIX Threads for Windows
- *      Copyright 1998 John E. Bossom
- *      Copyright 1999-2016, Pthreads4w contributors
- *
- *      Homepage: https://sourceforge.net/projects/pthreads4w/
- *
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *
- *      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+##      Pthreads4w - POSIX Threads for Windows
+##      Copyright 1998 John E. Bossom
+##      Copyright 1999-2016, Pthreads4w contributors
+##
+##      Homepage: https://sourceforge.net/projects/pthreads4w/
+##
+##      The current list of contributors is contained
+##      in the file CONTRIBUTORS included with the source
+##      code distribution. The list can also be seen at the
+##      following World Wide Web location:
+##
+##      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
+##
+##      This library 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 library 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.
+## 
+##      You should have received a copy of the GNU Lesser General Public
+##      License along with this library in the file COPYING.LIB;
+##      if not, write to the Free Software Foundation, Inc.,
+##      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 ##
 #
 # PTW32_AC_CHECK_TYPEDEF( TYPENAME, [HEADER] )

diff --git a/configure.ac b/configure.ac
@@ -1,30 +1,33 @@
 # configure.ac
 # --------------------------------------------------------------------------
 #
- *      Pthreads4w - POSIX Threads for Windows
- *      Copyright 1998 John E. Bossom
- *      Copyright 1999-2016, Pthreads4w contributors
- *
- *      Homepage: https://sourceforge.net/projects/pthreads4w/
- *
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *
- *      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+#      Pthreads4w - POSIX Threads for Windows
+#      Copyright 1998 John E. Bossom
+#      Copyright 1999-2016, Pthreads4w contributors
+#
+#      Homepage: https://sourceforge.net/projects/pthreads4w/
+#
+#      The current list of contributors is contained
+#      in the file CONTRIBUTORS included with the source
+#      code distribution. The list can also be seen at the
+#      following World Wide Web location:
+#
+#      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
+#
+#      This library 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 library 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.
+# 
+#      You should have received a copy of the GNU Lesser General Public
+#      License along with this library in the file COPYING.LIB;
+#      if not, write to the Free Software Foundation, Inc.,
+#      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 AC_INIT([pthreads-win32],[git])
 AC_CONFIG_HEADERS([config.h])

diff --git a/tests/GNUmakefile.in b/tests/GNUmakefile.in
@@ -3,30 +3,33 @@
 #
 # --------------------------------------------------------------------------
 #
- *      Pthreads4w - POSIX Threads for Windows
- *      Copyright 1998 John E. Bossom
- *      Copyright 1999-2016, Pthreads4w contributors
- *
- *      Homepage: https://sourceforge.net/projects/pthreads4w/
- *
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *
- *      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+#      Pthreads4w - POSIX Threads for Windows
+#      Copyright 1998 John E. Bossom
+#      Copyright 1999-2016, Pthreads4w contributors
+#
+#      Homepage: https://sourceforge.net/projects/pthreads4w/
+#
+#      The current list of contributors is contained
+#      in the file CONTRIBUTORS included with the source
+#      code distribution. The list can also be seen at the
+#      following World Wide Web location:
+#
+#      https://sourceforge.net/p/pthreads4w/wiki/Contributors/
+#
+#      This library 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 library 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.
+# 
+#      You should have received a copy of the GNU Lesser General Public
+#      License along with this library in the file COPYING.LIB;
+#      if not, write to the Free Software Foundation, Inc.,
+#      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@