From a4bb22b23cdeea2c043b533b9a5b70afdc0728c3 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 4 Sep 2010 20:00:15 +0000 Subject: [PATCH] Clarify Derek's code to be licensed "GPL v2 or later" as he has confirmed in private email. All of his other code has been licensed this way all along anyway. After this change, all source code files are licensed under both GPL version 2 and GPL version 3, which gives us enough flexibility in case any requirements might switch to GPL v3-only. But currently we are for sure both. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19546 57a11ea4-9604-0410-9ed3-97b8803252fd --- LICENSE | 7 +++---- src/business/business-gnome/search-owner.c | 5 +++-- src/business/business-gnome/search-owner.h | 5 +++-- src/gnome-search/gnc-general-search.c | 6 +++--- src/gnome-search/search-account.c | 5 +++-- src/gnome-search/search-account.h | 5 +++-- src/gnome-search/search-boolean.c | 5 +++-- src/gnome-search/search-boolean.h | 5 +++-- src/gnome-search/search-core-type.c | 5 +++-- src/gnome-search/search-core-type.h | 5 +++-- src/gnome-search/search-date.c | 5 +++-- src/gnome-search/search-date.h | 5 +++-- src/gnome-search/search-double.c | 5 +++-- src/gnome-search/search-double.h | 5 +++-- src/gnome-search/search-int64.c | 5 +++-- src/gnome-search/search-int64.h | 5 +++-- src/gnome-search/search-numeric.c | 5 +++-- src/gnome-search/search-numeric.h | 5 +++-- src/gnome-search/search-reconciled.c | 5 +++-- src/gnome-search/search-reconciled.h | 5 +++-- src/gnome-search/search-string.c | 5 +++-- src/gnome-search/search-string.h | 5 +++-- 22 files changed, 66 insertions(+), 47 deletions(-) diff --git a/LICENSE b/LICENSE index fc42219f73..60cd5dc3fa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,12 @@ 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. +General Public License, Version 2, or (at your option) Version 3. 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. +are licensed under "Version 2 and/or Version 3" of the GNU GPL +specifically. Some of the source files have an exception for linking against OpenSSL, as per the following language: diff --git a/src/business/business-gnome/search-owner.c b/src/business/business-gnome/search-owner.c index 01c2a4bc85..25fcc8379a 100644 --- a/src/business/business-gnome/search-owner.c +++ b/src/business/business-gnome/search-owner.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/business/business-gnome/search-owner.h b/src/business/business-gnome/search-owner.h index 3b41c6f552..e7c2541d24 100644 --- a/src/business/business-gnome/search-owner.h +++ b/src/business/business-gnome/search-owner.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/gnc-general-search.c b/src/gnome-search/gnc-general-search.c index ee06452019..bcbe4e0031 100644 --- a/src/gnome-search/gnc-general-search.c +++ b/src/gnome-search/gnc-general-search.c @@ -8,9 +8,9 @@ * Derek Atkins * * Gnucash is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public License - * as published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * modify it under the terms of 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. * * Gnucash is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c index 9ce33f670f..08cd65657d 100644 --- a/src/gnome-search/search-account.c +++ b/src/gnome-search/search-account.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-account.h b/src/gnome-search/search-account.h index 7e96c57806..eaffe3efa6 100644 --- a/src/gnome-search/search-account.h +++ b/src/gnome-search/search-account.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-boolean.c b/src/gnome-search/search-boolean.c index ae0b2b19e9..525f9315bb 100644 --- a/src/gnome-search/search-boolean.c +++ b/src/gnome-search/search-boolean.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-boolean.h b/src/gnome-search/search-boolean.h index 33ab9947bc..d6783d3490 100644 --- a/src/gnome-search/search-boolean.h +++ b/src/gnome-search/search-boolean.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-core-type.c b/src/gnome-search/search-core-type.c index e99e7dd1d9..81f45ef469 100644 --- a/src/gnome-search/search-core-type.c +++ b/src/gnome-search/search-core-type.c @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-core-type.h b/src/gnome-search/search-core-type.h index 1fb635e6d6..473ea3e0f0 100644 --- a/src/gnome-search/search-core-type.h +++ b/src/gnome-search/search-core-type.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-date.c b/src/gnome-search/search-date.c index c80d6d0c6e..fbb8c9bdcb 100644 --- a/src/gnome-search/search-date.c +++ b/src/gnome-search/search-date.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-date.h b/src/gnome-search/search-date.h index 2e1b77ba19..9c39d8553a 100644 --- a/src/gnome-search/search-date.h +++ b/src/gnome-search/search-date.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-double.c b/src/gnome-search/search-double.c index 6388f6a723..e8c0371df8 100644 --- a/src/gnome-search/search-double.c +++ b/src/gnome-search/search-double.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-double.h b/src/gnome-search/search-double.h index 0933995a6b..0b776a9f67 100644 --- a/src/gnome-search/search-double.h +++ b/src/gnome-search/search-double.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-int64.c b/src/gnome-search/search-int64.c index 847438a7c7..3169cb72da 100644 --- a/src/gnome-search/search-int64.c +++ b/src/gnome-search/search-int64.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-int64.h b/src/gnome-search/search-int64.h index 33a1aa0a52..892281caca 100644 --- a/src/gnome-search/search-int64.h +++ b/src/gnome-search/search-int64.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-numeric.c b/src/gnome-search/search-numeric.c index 98865f6a33..b602d63b69 100644 --- a/src/gnome-search/search-numeric.c +++ b/src/gnome-search/search-numeric.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-numeric.h b/src/gnome-search/search-numeric.h index c70f71a116..b038b293a0 100644 --- a/src/gnome-search/search-numeric.h +++ b/src/gnome-search/search-numeric.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-reconciled.c b/src/gnome-search/search-reconciled.c index 11255d47d0..9b0fbda335 100644 --- a/src/gnome-search/search-reconciled.c +++ b/src/gnome-search/search-reconciled.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-reconciled.h b/src/gnome-search/search-reconciled.h index d3d723233b..599c1dcf17 100644 --- a/src/gnome-search/search-reconciled.h +++ b/src/gnome-search/search-reconciled.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-string.c b/src/gnome-search/search-string.c index aebfe59fab..e1f2d4ddae 100644 --- a/src/gnome-search/search-string.c +++ b/src/gnome-search/search-string.c @@ -6,8 +6,9 @@ * Copyright (c) 2006 David Hampton * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gnome-search/search-string.h b/src/gnome-search/search-string.h index cbf4b3b7fc..24d7461be9 100644 --- a/src/gnome-search/search-string.h +++ b/src/gnome-search/search-string.h @@ -4,8 +4,9 @@ * Authors: Derek Atkins * * 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 published by the Free Software Foundation. + * modify it under the terms of 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of