From: Zooko O'Whielacronx Date: Sun, 20 Sep 2009 17:16:31 +0000 (-0700) Subject: doc: licensing cleanups X-Git-Url: https://git.rkrishnan.org/class-simplejson.JSONDecoder-index.html?a=commitdiff_plain;h=603e08c4a9a7e58a8cdb7a423111acf0ea84157b;p=tahoe-lafs%2Ftahoe-lafs.git doc: licensing cleanups Use nice utf-8 © instead of "(c)". Remove licensing statements on utility modules that have been assigned to allmydata.com by their original authors. (Nattraverso was not assigned to allmydata.com -- it was LGPL'ed -- but I checked and src/allmydata/util/iputil.py was completely rewritten and doesn't contain any line of code from nattraverso.) Add notes to misc/debian/copyright about licensing on files that aren't just allmydata.com-licensed. --- diff --git a/misc/debian/copyright b/misc/debian/copyright index d5834e65..488d1415 100644 --- a/misc/debian/copyright +++ b/misc/debian/copyright @@ -2,7 +2,7 @@ This package was debianized by Brian Warner The upstream source of this project is http://allmydata.org . -Copyright (c) 2006-2009 +Copyright © 2006-2009 AllMyData, Inc. You may use this package under the GNU General Public License, version 2 or, at @@ -25,3 +25,10 @@ for the terms of the Transitive Grace Period Public Licence, version 1. (You may choose to use this package under the terms of either licence, at your option.) + + +The files mac/fuse.py and mac/fuseparts/subbedopts.py are licensed under +the GNU Lesser General Public Licence. + + +The file src/allmydata/util/figleaf.py is licensed under the MIT licence. diff --git a/setup.py b/setup.py index 0ea3fc10..f1cd6a79 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # Allmydata Tahoe -- secure, distributed storage grid # -# Copyright (C) 2008-2009 Allmydata, Inc. +# Copyright © 2008-2009 Allmydata, Inc. # # This file is part of Tahoe-LAFS. # diff --git a/src/allmydata/test/test_base62.py b/src/allmydata/test/test_base62.py index 51d87063..9eff8aba 100644 --- a/src/allmydata/test/test_base62.py +++ b/src/allmydata/test/test_base62.py @@ -1,10 +1,4 @@ #!/usr/bin/env python -# -# Copyright (c) 2002-2009 Zooko Wilcox-O'Hearn -# mailto:zooko@zooko.com -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this work to deal in this work without restriction (including the rights -# to use, modify, distribute, sublicense, and/or sell copies). import random, unittest diff --git a/src/allmydata/util/assertutil.py b/src/allmydata/util/assertutil.py index 021c3e62..f3dfb85b 100644 --- a/src/allmydata/util/assertutil.py +++ b/src/allmydata/util/assertutil.py @@ -1,10 +1,3 @@ -# Copyright (c) 2003-2008 Zooko Wilcox-O'Hearn -# mailto:zooko@zooko.com -# http://zooko.com -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this work to deal in this work without restriction (including the -# rights to use, modify, distribute, sublicense, and/or sell copies) - """ Tests useful in assertion checking, prints out nicely formated messages too. """ diff --git a/src/allmydata/util/base62.py b/src/allmydata/util/base62.py index a768a267..5a142098 100644 --- a/src/allmydata/util/base62.py +++ b/src/allmydata/util/base62.py @@ -1,11 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2002-2009 Zooko Wilcox-O'Hearn -# mailto:zooko@zooko.com -# Permission is hereby granted to any person obtaining a copy of this work to -# deal in this work without restriction (including the rights to use, modify, -# distribute, sublicense, and/or sell copies). - # from the Python Standard Library import string diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index 33604dc8..bc500cbd 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -1,6 +1,3 @@ -# Copyright (c) 2002-2009 Zooko Wilcox-O'Hearn -# This file is part of pyutil; see README.txt for licensing terms. - """ Futz with files like a pro. """ diff --git a/src/allmydata/util/humanreadable.py b/src/allmydata/util/humanreadable.py index 663f363f..603dcacf 100644 --- a/src/allmydata/util/humanreadable.py +++ b/src/allmydata/util/humanreadable.py @@ -1,6 +1,3 @@ -# Copyright (c) 2002-2009 Zooko Wilcox-O'Hearn -# This file is part of pyutil; see README.txt for licensing terms. - import exceptions, os from repr import Repr diff --git a/src/allmydata/util/iputil.py b/src/allmydata/util/iputil.py index 6c5ae4de..f4b3e3a4 100644 --- a/src/allmydata/util/iputil.py +++ b/src/allmydata/util/iputil.py @@ -1,8 +1,3 @@ -# portions extracted from ipaddresslib by Autonomous Zone Industries, LGPL (author: Greg Smith) -# portions adapted from nattraverso.ipdiscover -# portions authored by Brian Warner, working for Allmydata -# most recent version authored by Zooko O'Whielacronx, working for Allmydata - # from the Python Standard Library import os, re, socket, sys