From baead73df03a752366db6280d903e1c8ba8d4f12 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Sun, 30 Nov 2008 19:25:45 +0000 Subject: [PATCH] Fix up some licence stuff --- deluge/plugins/blocklist/blocklist/gtkui.py | 9 ------ deluge/ui/webui/__init__.py | 10 ------- deluge/ui/webui/debugerror.py | 4 +-- .../webui/lib/webpy022/wsgiserver/LICENSE.txt | 25 +++++++++++++++++ .../webui/lib/webpy022/wsgiserver/__init__.py | 5 +++- deluge/ui/webui/static/deluge.js | 28 ------------------- deluge/ui/webui/static/refresh.js | 21 ++++++++++++-- 7 files changed, 49 insertions(+), 53 deletions(-) create mode 100644 deluge/ui/webui/lib/webpy022/wsgiserver/LICENSE.txt diff --git a/deluge/plugins/blocklist/blocklist/gtkui.py b/deluge/plugins/blocklist/blocklist/gtkui.py index 31440eccb..8c18ab3c3 100644 --- a/deluge/plugins/blocklist/blocklist/gtkui.py +++ b/deluge/plugins/blocklist/blocklist/gtkui.py @@ -21,15 +21,6 @@ # 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 gtk diff --git a/deluge/ui/webui/__init__.py b/deluge/ui/webui/__init__.py index d9f1b0710..00825b045 100644 --- a/deluge/ui/webui/__init__.py +++ b/deluge/ui/webui/__init__.py @@ -19,13 +19,3 @@ # 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 - - diff --git a/deluge/ui/webui/debugerror.py b/deluge/ui/webui/debugerror.py index 8adad9517..ff584b1df 100644 --- a/deluge/ui/webui/debugerror.py +++ b/deluge/ui/webui/debugerror.py @@ -4,8 +4,8 @@ adapted for deluge-webui: -pretty errors for well known exceptions. -web.py : -adapted from Django +debugerror.py : +This is adapted from Django Copyright (c) 2005, the Lawrence Journal-World Used under the modified BSD license: http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5 diff --git a/deluge/ui/webui/lib/webpy022/wsgiserver/LICENSE.txt b/deluge/ui/webui/lib/webpy022/wsgiserver/LICENSE.txt new file mode 100644 index 000000000..a15165ee2 --- /dev/null +++ b/deluge/ui/webui/lib/webpy022/wsgiserver/LICENSE.txt @@ -0,0 +1,25 @@ +Copyright (c) 2004-2007, CherryPy Team (team@cherrypy.org) +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the CherryPy Team nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py b/deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py index 1fe1c71ec..71a68d6b9 100644 --- a/deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py +++ b/deluge/ui/webui/lib/webpy022/wsgiserver/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2004-2007, CherryPy Team (team@cherrypy.org) +# All rights reserved. +# See LICENSE.TXT + """A high-speed, production ready, thread pooled, generic WSGI server. Simplest example on how to use this module directly @@ -1016,4 +1020,3 @@ class CherryPyWSGIServer(object): if key and value: wsgikey = 'SSL_SERVER_%s_DN_%s' % (prefix, key) self.ssl_environ[wsgikey] = value - diff --git a/deluge/ui/webui/static/deluge.js b/deluge/ui/webui/static/deluge.js index e3edbd344..7310c6149 100644 --- a/deluge/ui/webui/static/deluge.js +++ b/deluge/ui/webui/static/deluge.js @@ -17,15 +17,6 @@ # 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. all javascript is optional, everything should work web 1.0 @@ -243,22 +234,3 @@ if (document.cookie.length>0) } return "" } - - - - - - - - - - - - - - - - - - - diff --git a/deluge/ui/webui/static/refresh.js b/deluge/ui/webui/static/refresh.js index 6e399d02f..2b8c43516 100644 --- a/deluge/ui/webui/static/refresh.js +++ b/deluge/ui/webui/static/refresh.js @@ -1,6 +1,22 @@ /* -(c) Martijn Voncken mvoncken@gmail.com -License : GPLv3 +# Copyright (C) Martijn Voncken 2008 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, write to: +# The Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301, USA. +# quick and dirty auto-refresh timer. Our users have waited too long for a new auto-refresh. @@ -53,4 +69,3 @@ function toggle_timer() { start_timer(); } } -