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 d5834e652a378cf715c6dcda5e4b349c9e706c93..488d1415b3982e06ff1875e71e85cb4e689957ec 100644 (file)
--- a/misc/debian/copyright
+++ b/misc/debian/copyright
@@ -2,7 +2,7 @@ This package was debianized by Brian Warner <warner@allmydata.com>
 
 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 0ea3fc10eadb750330b87b25b6f25c6134f4e369..f1cd6a79e714fa818f222b539a775efcec7713cf 100644 (file)
--- 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 51d87063899b2898ceb60e2950939f07c5a0de89..9eff8aba15916ade3d499296bfcd10f742b5838c 100644 (file)
--- 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 021c3e6205b9687e3d6c0a8429c05d2ce5802835..f3dfb85bb066c63e456e9465195baec097caabb1 100644 (file)
--- 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 a768a26720a14eae7fc91bbfbce63311946cb89d..5a14209819ebb93349cfcc781488fe3ca6f48bbf 100644 (file)
--- 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 33604dc8d8dede3257e877e9a89d9df4f290fee2..bc500cbdcd48549804f35eb5cd13c96ea4f14b01 100644 (file)
--- 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 663f363ff34be8dcc7e41bafa1cac13abdc5955d..603dcacf76803d519eb6619f6c7470f7060fe644 100644 (file)
--- 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 6c5ae4de05c92a7f9af1d76e6da514e86da228c7..f4b3e3a4211f4963ae04bdfdd5af237cece11ded 100644 (file)
--- 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