zfec: yet another tweak to the licence

diff --git a/src/zfec/COPYING b/src/zfec/COPYING
index ff1017ad9bc8ec3c70d067d701b24f9c19ede7a1..0c5b3e337a46bd28abbdf23c9ed6f5a117d2ea72 100644 (file)
--- a/src/zfec/COPYING
+++ b/src/zfec/COPYING
@@ -1,7 +1,7 @@
 In addition to the terms of the GNU General Public License, this licence also
 comes with the added permission that, if you become obligated to release a
-derived work under this licence (as per section 2.b of the GPL), you may
-delay the fulfillment of this obligation for up to 12 months.
+derived work under this licence (as per section 2.b), you may delay the
+fulfillment of this obligation for up to 12 months.
 
 
                    GNU GENERAL PUBLIC LICENSE

diff --git a/src/zfec/README.txt b/src/zfec/README.txt
index dc1a5fbe1857529da7a5e59b0da7120d49054d1d..e3a10310e5759b7d09d8166cca53433e33eea195 100644 (file)
--- a/src/zfec/README.txt
+++ b/src/zfec/README.txt
@@ -3,11 +3,12 @@
 This package implements an "erasure code", or "forward error correction
 code".
 
-It is offered under the GNU General Public License v2 or (at your option) any
-later version.  This package also comes with the added permission that, in
-the case that you are obligated to release a derived work under this licence
-(as per section 2.b of the GPL), you may delay the fulfillment of this
-obligation for up to 12 months.
+It is offered under the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option) any
+later version, with the added permission that, if you become obligated to
+release a derived work under this licence (as per section 2.b), you may delay
+the fulfillment of this obligation for up to 12 months.  See the file COPYING
+for details.
 
 The most widely known example of an erasure code is the RAID-5 algorithm
 which makes it so that in the event of the loss of any one hard drive, the

diff --git a/src/zfec/setup.py b/src/zfec/setup.py
index 6e91e483ee4ce900ab6b153a2789f53a4a12dac4..870ef65271f3ff1ab3900df288bc27d5eef9fc71 100644 (file)
--- a/src/zfec/setup.py
+++ b/src/zfec/setup.py
@@ -11,8 +11,9 @@
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/__init__.py b/src/zfec/zfec/__init__.py
index 2e710e4cf1f1598b0945f00ab1d674eb9c13e633..7cf578503203a5f18bb3bba0b4163d981461501e 100644 (file)
--- a/src/zfec/zfec/__init__.py
+++ b/src/zfec/zfec/__init__.py
@@ -26,13 +26,14 @@ import filefec, cmdline_zfec, cmdline_zunfec
 # mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
-# 
+#
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/zfec/zfec/_fecmodule.c b/src/zfec/zfec/_fecmodule.c
index b973d118aa69b66374914b91d54e136ed947173f..c75cfec768686c4f5cf6802f9d0115a80f0884c9 100644 (file)
--- a/src/zfec/zfec/_fecmodule.c
+++ b/src/zfec/zfec/_fecmodule.c
@@ -596,8 +596,9 @@ init_fec(void) {
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
  * any later version, with the added permission that, if you become obligated
- * to release a derived work under this licence (as per section 2.b of the
- * GPL), you may delay the fulfillment of this obligation for up to 12 months.
+ * to release a derived work under this licence (as per section 2.b), you may
+ * delay the fulfillment of this obligation for up to 12 months.  See the file
+ * COPYING for details.
  *
  * If you would like to inquire about a commercial relationship with Allmydata,
  * Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/cmdline_zfec.py b/src/zfec/zfec/cmdline_zfec.py
index f399fd1c214f8059e58ddd368054eeb0baf2b8ad..7c96eed11d5b80679084c14e05fb57a0cac16078 100644 (file)
--- a/src/zfec/zfec/cmdline_zfec.py
+++ b/src/zfec/zfec/cmdline_zfec.py
@@ -68,8 +68,9 @@ def main():
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/cmdline_zunfec.py b/src/zfec/zfec/cmdline_zunfec.py
index 7c9f3f621c328888b6316317e8e737447963326a..7f822fbddd5975d6f73132c49a8712925f06f0b1 100644 (file)
--- a/src/zfec/zfec/cmdline_zunfec.py
+++ b/src/zfec/zfec/cmdline_zunfec.py
@@ -70,8 +70,9 @@ def main():
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/easyfec.py b/src/zfec/zfec/easyfec.py
index db36b321f3a6de427c35b2dc6851bad0ffa18945..11ed0ee55c9a910e513954560e49faf84b2271a4 100644 (file)
--- a/src/zfec/zfec/easyfec.py
+++ b/src/zfec/zfec/easyfec.py
@@ -44,13 +44,14 @@ class Decoder(object):
 # Author: Zooko Wilcox-O'Hearn
 # 
 # This file is part of zfec.
-# 
+#
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/fec.c b/src/zfec/zfec/fec.c
index 6b5fa86b96b7dc35c8ea35329892e4a96cea1496..f762edc1f05f4053e3180eedfb88f54ec5548b0a 100644 (file)
--- a/src/zfec/zfec/fec.c
+++ b/src/zfec/zfec/fec.c
@@ -563,8 +563,9 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
  * any later version, with the added permission that, if you become obligated
- * to release a derived work under this licence (as per section 2.b of the
- * GPL), you may delay the fulfillment of this obligation for up to 12 months.
+ * to release a derived work under this licence (as per section 2.b), you may
+ * delay the fulfillment of this obligation for up to 12 months.  See the file
+ * COPYING for details.
  *
  * If you would like to inquire about a commercial relationship with Allmydata,
  * Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/fec.h b/src/zfec/zfec/fec.h
index 1e8b44d90f5b5e00e26cbe39ba4f7bb9f4391a2c..299f5e7b2cb5eabe9cb5969ca0c2ab0b9466a98a 100644 (file)
--- a/src/zfec/zfec/fec.h
+++ b/src/zfec/zfec/fec.h
@@ -46,8 +46,9 @@ void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
  * any later version, with the added permission that, if you become obligated
- * to release a derived work under this licence (as per section 2.b of the
- * GPL), you may delay the fulfillment of this obligation for up to 12 months.
+ * to release a derived work under this licence (as per section 2.b), you may
+ * delay the fulfillment of this obligation for up to 12 months.  See the file
+ * COPYING for details.
  *
  * If you would like to inquire about a commercial relationship with Allmydata,
  * Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/filefec.py b/src/zfec/zfec/filefec.py
index d35ec7220534b5d216180699376e1c0616391c75..47e4e0fa1d8202191b3d4d254889e97f8c5a1e0e 100644 (file)
--- a/src/zfec/zfec/filefec.py
+++ b/src/zfec/zfec/filefec.py
@@ -421,8 +421,9 @@ def encode_file_stringy_easyfec(inf, cb, k, m, chunksize=4096):
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/test/test_util.py b/src/zfec/zfec/test/test_util.py
index 12542fdbfbe60a8e6a50c6974e39147f3fe4f3e8..c555e6c4b3c1cc5fb057eb2bb22cbdfa0979a8c3 100644 (file)
--- a/src/zfec/zfec/test/test_util.py
+++ b/src/zfec/zfec/test/test_util.py
@@ -119,8 +119,9 @@ class Math(unittest.TestCase):
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/test/test_zfec.py b/src/zfec/zfec/test/test_zfec.py
index 70ced57b6e6fbfa90891ccf5104641f1d9ceb50f..f7b7ecb294d1df786617f569a999dfb4f5fec539 100644 (file)
--- a/src/zfec/zfec/test/test_zfec.py
+++ b/src/zfec/zfec/test/test_zfec.py
@@ -234,8 +234,9 @@ class Cmdline(unittest.TestCase):
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/util/fileutil.py b/src/zfec/zfec/util/fileutil.py
index 67178d7ca08211e4f04e4b23930b504437b37b25..87fe7b03b3ab028a6fac46dd552296c23c2fe973 100644 (file)
--- a/src/zfec/zfec/util/fileutil.py
+++ b/src/zfec/zfec/util/fileutil.py
@@ -248,8 +248,9 @@ def remove_if_possible(f):
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/util/mathutil.py b/src/zfec/zfec/util/mathutil.py
index 8bf1be7dbb4efabf31d82e6c5f77b28c5fedd459..160a7df37212661f599fb98094d1639a56bf838b 100644 (file)
--- a/src/zfec/zfec/util/mathutil.py
+++ b/src/zfec/zfec/util/mathutil.py
@@ -82,8 +82,9 @@ def permute(l):
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit

diff --git a/src/zfec/zfec/util/version.py b/src/zfec/zfec/util/version.py
index ba30ca22d3c1ff0f8248d24591ffd80789be853d..6851becf8efbb7c43e96edd6542e545fb16155a9 100644 (file)
--- a/src/zfec/zfec/util/version.py
+++ b/src/zfec/zfec/util/version.py
@@ -125,7 +125,6 @@ class Version:
 # 
 # Copyright (C) 2007 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# mailto:zooko@zooko.com
 # 
 # This file is part of zfec.
 # 
@@ -133,29 +132,9 @@ class Version:
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-# 
-# Copyright (C) 2007 Allmydata, Inc.
-# Author: Zooko Wilcox-O'Hearn
-# 
-# This file is part of zfec.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option)
-# any later version, with the added permission that, if you become obligated
-# to release a derived work under this licence (as per section 2.b of the
-# GPL), you may delay the fulfillment of this obligation for up to 12 months.
+# to release a derived work under this licence (as per section 2.b), you may
+# delay the fulfillment of this obligation for up to 12 months.  See the file
+# COPYING for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit