r19507 - gnucash/trunk - Update license after Josh Sled's relicensing of his code under GPL v2 and/or v3.
Christian Stimming
cstim at code.gnucash.org
Sun Aug 29 15:43:20 EDT 2010
Author: cstim
Date: 2010-08-29 15:43:19 -0400 (Sun, 29 Aug 2010)
New Revision: 19507
Trac: http://svn.gnucash.org/trac/changeset/19507
Modified:
gnucash/trunk/LICENSE
gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
gnucash/trunk/src/app-utils/gnc-sx-instance-model.h
gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.c
gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.h
gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c
gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.h
gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.c
gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.h
gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.h
gnucash/trunk/src/gnome/dialog-sx-editor.c
gnucash/trunk/src/gnome/dialog-sx-editor.h
gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
gnucash/trunk/src/gnome/dialog-sx-since-last-run.h
gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c
gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.h
Log:
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.
Modified: gnucash/trunk/LICENSE
===================================================================
--- gnucash/trunk/LICENSE 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/LICENSE 2010-08-29 19:43:19 UTC (rev 19507)
@@ -3,9 +3,11 @@
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 @@
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.
------------------------------------------------------------
Modified: gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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
Modified: gnucash/trunk/src/app-utils/gnc-sx-instance-model.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-sx-instance-model.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/app-utils/gnc-sx-instance-model.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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,
Modified: gnucash/trunk/src/gnome/dialog-sx-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome/dialog-sx-editor.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -3,7 +3,7 @@
* Copyright (C) 2001,2002,2006 Joshua Sled <jsled at 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
Modified: gnucash/trunk/src/gnome/dialog-sx-editor.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome/dialog-sx-editor.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -3,7 +3,7 @@
* Copyright (C) 2001,2006 Joshua Sled <jsled at 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, *
Modified: gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-since-last-run.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome/dialog-sx-since-last-run.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Joshua Sled <jsled at 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
Modified: gnucash/trunk/src/gnome/dialog-sx-since-last-run.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-since-last-run.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome/dialog-sx-since-last-run.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Joshua Sled <jsled at 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, *
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.h
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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,
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Joshua Sled <jsled at 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
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Joshua Sled <jsled at 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,
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Joshua Sled <jsled at 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
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Joshua Sled <jsled at 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,
Modified: gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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
Modified: gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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,
Modified: gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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
Modified: gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-sx-list-tree-model-adapter.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -4,7 +4,7 @@
* Copyright (C) 2006 Josh Sled <jsled at 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,
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c 2010-08-29 19:43:19 UTC (rev 19507)
@@ -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
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.h 2010-08-29 19:43:05 UTC (rev 19506)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.h 2010-08-29 19:43:19 UTC (rev 19507)
@@ -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, *
More information about the gnucash-changes
mailing list