From 603e08c4a9a7e58a8cdb7a423111acf0ea84157b Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sun, 20 Sep 2009 10:16:31 -0700
Subject: [PATCH] =?utf8?q?doc:=20licensing=20cleanups=20Use=20nice=20utf-8?=
 =?utf8?q?=20=C2=A9=20instead=20of=20"(c)".=20Remove=20licensing=20stateme?=
 =?utf8?q?nts=20on=20utility=20modules=20that=20have=20been=20assigned=20t?=
 =?utf8?q?o=20allmydata.com=20by=20their=20original=20authors.=20(Nattrave?=
 =?utf8?q?rso=20was=20not=20assigned=20to=20allmydata.com=20--=20it=20was?=
 =?utf8?q?=20LGPL'ed=20--=20but=20I=20checked=20and=20src/allmydata/util/i?=
 =?utf8?q?putil.py=20was=20completely=20rewritten=20and=20doesn't=20contai?=
 =?utf8?q?n=20any=20line=20of=20code=20from=20nattraverso.)=20=20Add=20not?=
 =?utf8?q?es=20to=20misc/debian/copyright=20about=20licensing=20on=20files?=
 =?utf8?q?=20that=20aren't=20just=20allmydata.com-licensed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 misc/debian/copyright               | 9 ++++++++-
 setup.py                            | 2 +-
 src/allmydata/test/test_base62.py   | 6 ------
 src/allmydata/util/assertutil.py    | 7 -------
 src/allmydata/util/base62.py        | 6 ------
 src/allmydata/util/fileutil.py      | 3 ---
 src/allmydata/util/humanreadable.py | 3 ---
 src/allmydata/util/iputil.py        | 5 -----
 8 files changed, 9 insertions(+), 32 deletions(-)

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 <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 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
 
-- 
2.45.2