From 442bdf1c4c9dd1f05a084f8e1176386f83a18cad Mon Sep 17 00:00:00 2001 From: Zach Tibbitts Date: Tue, 12 Jun 2007 16:33:32 +0000 Subject: [PATCH] license fixes --- LICENSE | 11 +++++++++++ scripts/deluge | 10 ++++++++++ setup.py | 10 ++++++++++ src/common.py | 10 ++++++++++ src/core.py | 10 ++++++++++ src/deluge_core.cpp | 10 ++++++++++ src/deluge_stats.py | 10 ++++++++++ src/dgtk.py | 10 ++++++++++ src/dialogs.py | 10 ++++++++++ src/interface.py | 10 ++++++++++ src/ipc_manager.py | 10 ++++++++++ src/plugins.py | 10 ++++++++++ src/pref.py | 10 ++++++++++ 13 files changed, 131 insertions(+) diff --git a/LICENSE b/LICENSE index d60c31a97..0e7548892 100644 --- a/LICENSE +++ b/LICENSE @@ -338,3 +338,14 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the OpenSSL + library. + You must obey the GNU General Public License in all respects for all of + the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the file(s), + but you are not obligated to do so. If you do not wish to do so, delete + this exception statement from your version. If you delete this exception + statement from all source files in the program, then also delete it here. + diff --git a/scripts/deluge b/scripts/deluge index 5b45e1841..ee06dfb6f 100755 --- a/scripts/deluge +++ b/scripts/deluge @@ -23,6 +23,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. from optparse import OptionParser import sys diff --git a/setup.py b/setup.py index 83e5deec1..69b6a2a3e 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. import os, platform print "Attempting to detect your system information" diff --git a/src/common.py b/src/common.py index d5af7fe45..68afa8fc0 100644 --- a/src/common.py +++ b/src/common.py @@ -17,6 +17,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. import sys, os, os.path, webbrowser import xdg, xdg.BaseDirectory diff --git a/src/core.py b/src/core.py index 1dfe14ca0..6ac17a7f4 100644 --- a/src/core.py +++ b/src/core.py @@ -16,6 +16,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. # Deluge Library, previously known as python-libtorrent: # diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp index 6523fb429..33598c627 100644 --- a/src/deluge_core.cpp +++ b/src/deluge_core.cpp @@ -15,6 +15,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the OpenSSL + * library. + * You must obey the GNU General Public License in all respects for all of + * the code used other than OpenSSL. If you modify file(s) with this + * exception, you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete + * this exception statement from your version. If you delete this exception + * statement from all source files in the program, then also delete it here. + * * Thank You: Some code portions were derived from BSD-licensed work by * Arvid Norberg, and GPL-licensed work by Christophe Dumez */ diff --git a/src/deluge_stats.py b/src/deluge_stats.py index 41caf3a9a..f9b356cb8 100644 --- a/src/deluge_stats.py +++ b/src/deluge_stats.py @@ -16,6 +16,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. import time diff --git a/src/dgtk.py b/src/dgtk.py index 083ff3f6a..1e43e88e6 100644 --- a/src/dgtk.py +++ b/src/dgtk.py @@ -17,6 +17,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. # Similar to common, this contains any common functions # related to gtk that are needed by the client diff --git a/src/dialogs.py b/src/dialogs.py index fdbc873dd..134c09de8 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -17,6 +17,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. import common, dgtk import gtk, gtk.glade diff --git a/src/interface.py b/src/interface.py index 9fad10e8d..4d1108484 100644 --- a/src/interface.py +++ b/src/interface.py @@ -19,6 +19,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. import sys, os, os.path, urllib import core, common, dgtk, ipc_manager, dialogs diff --git a/src/ipc_manager.py b/src/ipc_manager.py index aed04a6fe..c5de29ddf 100644 --- a/src/ipc_manager.py +++ b/src/ipc_manager.py @@ -17,6 +17,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. # Code for dbus_importing borrowed from Listen (http://listen-project.org) diff --git a/src/plugins.py b/src/plugins.py index ee5a20f4b..5a9e75c22 100644 --- a/src/plugins.py +++ b/src/plugins.py @@ -19,6 +19,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. import os, sys, imp diff --git a/src/pref.py b/src/pref.py index cfb2d1a1d..b37bd7075 100644 --- a/src/pref.py +++ b/src/pref.py @@ -17,6 +17,16 @@ # The Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the OpenSSL +# library. +# You must obey the GNU General Public License in all respects for all of +# the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the file(s), +# but you are not obligated to do so. If you do not wish to do so, delete +# this exception statement from your version. If you delete this exception +# statement from all source files in the program, then also delete it here. # Preferences is basically a wrapper around a simple Python dictionary