diff options
| author | Joey Hess <joey@kitenet.net> | 2011-05-19 14:37:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-19 14:37:16 -0400 |
| commit | 30c3ceeaa24c9e5e30407d44a78fe56754960f52 (patch) | |
| tree | 872897d3133e4b86ccb242130d6bdfcbe01acfef /plugins/proxy.py | |
| parent | e818ad1c045f5e475de13716d847303ea9b59c4e (diff) | |
| download | ikiwiki-30c3ceeaa24c9e5e30407d44a78fe56754960f52.tar ikiwiki-30c3ceeaa24c9e5e30407d44a78fe56754960f52.tar.gz | |
Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
Apparently the rst library is changing to a GPL-2 incompatable license.
"madduck: joeyh: so yes, do as you think is right."
Diffstat (limited to 'plugins/proxy.py')
| -rw-r--r-- | plugins/proxy.py | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/plugins/proxy.py b/plugins/proxy.py index 477a365f8..c2e9bd621 100644 --- a/plugins/proxy.py +++ b/plugins/proxy.py @@ -4,14 +4,35 @@ # proxy.py — helper for Python-based external (xml-rpc) ikiwiki plugins # # Copyright © martin f. krafft <madduck@madduck.net> -# Released under the terms of the GNU GPL version 2 -# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. 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. +# . +# THIS SOFTWARE IS PROVIDED BY IKIWIKI 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 FOUNDATION +# 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. +# __name__ = 'proxy.py' __description__ = 'helper for Python-based external (xml-rpc) ikiwiki plugins' __version__ = '0.1' __author__ = 'martin f. krafft <madduck@madduck.net>' __copyright__ = 'Copyright © ' + __author__ -__licence__ = 'GPLv2' +__licence__ = 'BSD-2-clause' import sys import time |