Update license after Josh Sled's relicensing of his code under GPL v2 and/or v3.

He wrote to gnucash-devel on 2010-08-28: Much of the last batch code I contributed to gnucash was licensed without the "or any later version" clause of the GPL boilerplate, and thus specifically and only under version 2 of the GPL. I hereby extend that to version 2 and/or version 3. Any contribution I've made to gnucash which was under the GPLv2 only may be considered to be under both v2 and v3. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19507 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2010-08-29 19:43:19 +00:00
parent f8432c0cb6
commit 9eba06e5f5
19 changed files with 24 additions and 22 deletions
--- a/10
+++ b/10
@@ -3,9 +3,11 @@ This software is provided under a mutually-compatible set of licenses.
 The software, for most intents and purposes, is licensed under the GNU
 General Public License, Version 2.

-Almost all of the source files are licensed under the GNU GPL, Version 2,
-"or (at your option) any later version".  However, some of the source files
-are licensed under Version 2 of the GNU GPL specifically.
+Almost all of the source files are licensed under the GNU GPL, Version
+2, "or (at your option) any later version".  Some of the source files
+are licensed under "Version 2 and/or Version 3" of the GNU GPL, and
+very few other source files are licensed under "Version 2" of the GNU
+GPL specifically.

 Some of the source files have an exception for linking against OpenSSL, as
 per the following language:
@@ -26,7 +28,7 @@ Some of the source files are in the public domain.

 Please see the individual source files for their specific licensing.

-The text of the GNU GPL is below.
+The text of the GNU GPL, Version 2, is below.

 ------------------------------------------------------------

--- a/src/app-utils/gnc-sx-instance-model.c
+++ b/src/app-utils/gnc-sx-instance-model.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * As a special exception, permission is granted to link the binary module
--- a/src/app-utils/gnc-sx-instance-model.h
+++ b/src/app-utils/gnc-sx-instance-model.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
--- a/src/gnome-utils/gnc-dense-cal-model.c
+++ b/src/gnome-utils/gnc-dense-cal-model.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * under the terms of version 2 and/or version 3 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * As a special exception, permission is granted to link the binary module
--- a/src/gnome-utils/gnc-dense-cal-model.h
+++ b/src/gnome-utils/gnc-dense-cal-model.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * under the terms of version 2 and/or version 3 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
--- a/src/gnome-utils/gnc-dense-cal-store.c
+++ b/src/gnome-utils/gnc-dense-cal-store.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * under the terms of version 2 and/or version 3 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * As a special exception, permission is granted to link the binary module
--- a/src/gnome-utils/gnc-dense-cal-store.h
+++ b/src/gnome-utils/gnc-dense-cal-store.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * under the terms of version 2 and/or version 3 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
--- a/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
+++ b/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * As a special exception, permission is granted to link the binary module
--- a/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
+++ b/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
--- a/src/gnome-utils/gnc-sx-list-tree-model-adapter.c
+++ b/src/gnome-utils/gnc-sx-list-tree-model-adapter.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * As a special exception, permission is granted to link the binary module
--- a/src/gnome-utils/gnc-sx-list-tree-model-adapter.h
+++ b/src/gnome-utils/gnc-sx-list-tree-model-adapter.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
--- a/src/gnome-utils/gnc-tree-view-sx-list.c
+++ b/src/gnome-utils/gnc-tree-view-sx-list.c
@@ -4,7 +4,7 @@
 **/
 /********************************************************************
 * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of version 2 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
 * License as published by the Free Software Foundation.            *
 *
 * As a special exception, permission is granted to link the binary
--- a/src/gnome-utils/gnc-tree-view-sx-list.h
+++ b/src/gnome-utils/gnc-tree-view-sx-list.h
@@ -7,7 +7,7 @@
 **/
 /********************************************************************
 * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of version 2 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
 * License as published by the Free Software Foundation.            *
 *                                                                  *
 * This program is distributed in the hope that it will be useful,  *
--- a/src/gnome/dialog-sx-editor.c
+++ b/src/gnome/dialog-sx-editor.c
@@ -3,7 +3,7 @@
 * Copyright (C) 2001,2002,2006 Joshua Sled <jsled@asynchronous.org>*
 *                                                                  *
 * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of version 2 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
 * License as published by the Free Software Foundation.            *
 *
 * As a special exception, permission is granted to link the binary
--- a/src/gnome/dialog-sx-editor.h
+++ b/src/gnome/dialog-sx-editor.h
@@ -3,7 +3,7 @@
 * Copyright (C) 2001,2006 Joshua Sled <jsled@asynchronous.org>     *
 *                                                                  *
 * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of version 2 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
 * License as published by the Free Software Foundation.            *
 *                                                                  *
 * This program is distributed in the hope that it will be useful,  *
--- a/src/gnome/dialog-sx-since-last-run.c
+++ b/src/gnome/dialog-sx-since-last-run.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>          *
 *                                                                  *
 * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of version 2 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
 * License as published by the Free Software Foundation.            *
 *
 * As a special exception, permission is granted to link the binary
--- a/src/gnome/dialog-sx-since-last-run.h
+++ b/src/gnome/dialog-sx-since-last-run.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>          *
 *                                                                  *
 * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of version 2 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
 * License as published by the Free Software Foundation.            *
 *                                                                  *
 * This program is distributed in the hope that it will be useful,  *
--- a/src/gnome/gnc-plugin-page-sx-list.c
+++ b/src/gnome/gnc-plugin-page-sx-list.c
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * As a special exception, permission is granted to link the binary module
--- a/src/gnome/gnc-plugin-page-sx-list.h
+++ b/src/gnome/gnc-plugin-page-sx-list.h
@@ -4,7 +4,7 @@
 * Copyright (C) 2006 Josh Sled <jsled@asynchronous.org>
 *
 * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
+ * modify it under the terms of version 2 and/or version 3 of the GNU General Public
 * License as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,