From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 29 Jul 2010 05:29:23 +0000 (-0700)
Subject: docs: fix licensing typo that was earlier fixed in [20090921164651-92b7f-7f97b58101d9... 
X-Git-Url: https://git.rkrishnan.org/index.html?a=commitdiff_plain;h=302760a3390b79be1fcc857035fed643ed7413e9;p=tahoe-lafs%2Ftahoe-lafs.git

docs: fix licensing typo that was earlier fixed in [20090921164651-92b7f-7f97b58101d93dc588445c52a9aaa56a2c7ae336]
I wish we didn't copies of this licensing text in several different files so that changes can be accidentally omitted from some of them.
---

diff --git a/misc/debian/copyright b/misc/debian/copyright
index 807993e7..d7a8c6be 100644
--- a/misc/debian/copyright
+++ b/misc/debian/copyright
@@ -250,5 +250,5 @@ The file src/allmydata/util/statistics.py was originally licensed under the
 GPL3, but on 2009-09-21 its author Shawn Willden declared: "I hereby license
 all patches I have contributed or will contribute to the Allmydata Tahoe-LAFS
 project, including the file 'statistics.py', under both the GNU General Public
-License, version 2 or later, and under the Transitive Grace Period Public
+License, version 2 or later, or under the Transitive Grace Period Public
 License, version 1 or later."
diff --git a/misc/debian_helpers/etch/debian/copyright b/misc/debian_helpers/etch/debian/copyright
index 807993e7..d7a8c6be 100644
--- a/misc/debian_helpers/etch/debian/copyright
+++ b/misc/debian_helpers/etch/debian/copyright
@@ -250,5 +250,5 @@ The file src/allmydata/util/statistics.py was originally licensed under the
 GPL3, but on 2009-09-21 its author Shawn Willden declared: "I hereby license
 all patches I have contributed or will contribute to the Allmydata Tahoe-LAFS
 project, including the file 'statistics.py', under both the GNU General Public
-License, version 2 or later, and under the Transitive Grace Period Public
+License, version 2 or later, or under the Transitive Grace Period Public
 License, version 1 or later."
diff --git a/misc/debian_helpers/lenny/debian/copyright b/misc/debian_helpers/lenny/debian/copyright
index 807993e7..d7a8c6be 100644
--- a/misc/debian_helpers/lenny/debian/copyright
+++ b/misc/debian_helpers/lenny/debian/copyright
@@ -250,5 +250,5 @@ The file src/allmydata/util/statistics.py was originally licensed under the
 GPL3, but on 2009-09-21 its author Shawn Willden declared: "I hereby license
 all patches I have contributed or will contribute to the Allmydata Tahoe-LAFS
 project, including the file 'statistics.py', under both the GNU General Public
-License, version 2 or later, and under the Transitive Grace Period Public
+License, version 2 or later, or under the Transitive Grace Period Public
 License, version 1 or later."
diff --git a/misc/debian_helpers/sid/debian/copyright b/misc/debian_helpers/sid/debian/copyright
index 807993e7..d7a8c6be 100644
--- a/misc/debian_helpers/sid/debian/copyright
+++ b/misc/debian_helpers/sid/debian/copyright
@@ -250,5 +250,5 @@ The file src/allmydata/util/statistics.py was originally licensed under the
 GPL3, but on 2009-09-21 its author Shawn Willden declared: "I hereby license
 all patches I have contributed or will contribute to the Allmydata Tahoe-LAFS
 project, including the file 'statistics.py', under both the GNU General Public
-License, version 2 or later, and under the Transitive Grace Period Public
+License, version 2 or later, or under the Transitive Grace Period Public
 License, version 1 or later."