zfec: tweak licence text

diff --git a/src/zfec/COPYING b/src/zfec/COPYING
index 294b73f77b5284e34fabb74826f266e772e1ac27..b4344741d2f885f464823ea7759c50b42addcf34 100644 (file)
--- a/src/zfec/COPYING
+++ b/src/zfec/COPYING
@@ -1,12 +1,13 @@
-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), you may delay the
-fulfillment of this obligation for up to 12 months.
-
-This licence also comes with the added permission that you may link this
-program with the OpenSSL library and distribute executables, as long as you
-follow the requirements of this licence in regard to all of the software in
-the executable aside from OpenSSL.
+In addition to the terms written below, this licence comes 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.
+
+In addition to the terms written below, this licence comes with the added
+permission that you may link this program with the OpenSSL library and
+distribute executables, as long as you follow the requirements of this
+licence in regard to all of the software in the executable aside from
+OpenSSL.
 
 
                    GNU GENERAL PUBLIC LICENSE

diff --git a/src/zfec/setup.py b/src/zfec/setup.py
index 80d8b97649e9600e69fe54c03521339ea4518f1a..a8c08d8390c9264fbc46d1c52bc2ab6186369438 100644 (file)
--- a/src/zfec/setup.py
+++ b/src/zfec/setup.py
@@ -18,11 +18,6 @@
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.
 
 from ez_setup import use_setuptools
 use_setuptools(min_version='0.6a9')

diff --git a/src/zfec/zfec/__init__.py b/src/zfec/zfec/__init__.py
index ae874ccce05f50f0f97480a42ef02a38ce9be3c3..279c2269e7db83050516f0a046f67fb4365c292d 100644 (file)
--- a/src/zfec/zfec/__init__.py
+++ b/src/zfec/zfec/__init__.py
@@ -32,14 +32,5 @@ import filefec, cmdline_zfec, cmdline_zunfec
 # 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.
-# 
-# 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.
+# delay the fulfillment of this obligation for up to 12 months.  See the
+# COPYING file for details.

diff --git a/src/zfec/zfec/_fecmodule.c b/src/zfec/zfec/_fecmodule.c
index c75cfec768686c4f5cf6802f9d0115a80f0884c9..5c59870c63191fe4dc1edfe6e516656eef7e311c 100644 (file)
--- a/src/zfec/zfec/_fecmodule.c
+++ b/src/zfec/zfec/_fecmodule.c
@@ -603,11 +603,6 @@ init_fec(void) {
  * If you would like to inquire about a commercial relationship with Allmydata,
  * Inc., please contact partnerships@allmydata.com and visit
  * http://allmydata.com/.
- * 
- * 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.
  */
 
 /**

diff --git a/src/zfec/zfec/cmdline_zfec.py b/src/zfec/zfec/cmdline_zfec.py
index 7c96eed11d5b80679084c14e05fb57a0cac16078..ec5ec17d1ec5a24979720c4682d3f43afcde493a 100644 (file)
--- a/src/zfec/zfec/cmdline_zfec.py
+++ b/src/zfec/zfec/cmdline_zfec.py
@@ -75,8 +75,3 @@ def main():
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/cmdline_zunfec.py b/src/zfec/zfec/cmdline_zunfec.py
index 7f822fbddd5975d6f73132c49a8712925f06f0b1..99c806043b2c1ffb128b896d539b70ca7a9652bb 100644 (file)
--- a/src/zfec/zfec/cmdline_zunfec.py
+++ b/src/zfec/zfec/cmdline_zunfec.py
@@ -77,8 +77,3 @@ def main():
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/easyfec.py b/src/zfec/zfec/easyfec.py
index 11ed0ee55c9a910e513954560e49faf84b2271a4..1843a69730de8d34e59228be1df6c688e9cd25c2 100644 (file)
--- a/src/zfec/zfec/easyfec.py
+++ b/src/zfec/zfec/easyfec.py
@@ -56,9 +56,3 @@ class Decoder(object):
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.
-

diff --git a/src/zfec/zfec/fec.c b/src/zfec/zfec/fec.c
index f762edc1f05f4053e3180eedfb88f54ec5548b0a..e8afca8560bb9a685192c7167893d48ff19b6968 100644 (file)
--- a/src/zfec/zfec/fec.c
+++ b/src/zfec/zfec/fec.c
@@ -570,11 +570,6 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*
  * If you would like to inquire about a commercial relationship with Allmydata,
  * Inc., please contact partnerships@allmydata.com and visit
  * http://allmydata.com/.
- * 
- * 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.
  */
 
 /*

diff --git a/src/zfec/zfec/fec.h b/src/zfec/zfec/fec.h
index 299f5e7b2cb5eabe9cb5969ca0c2ab0b9466a98a..3d81899c7021f18f85ac3d3272965aa37eeed528 100644 (file)
--- a/src/zfec/zfec/fec.h
+++ b/src/zfec/zfec/fec.h
@@ -53,11 +53,6 @@ void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts
  * If you would like to inquire about a commercial relationship with Allmydata,
  * Inc., please contact partnerships@allmydata.com and visit
  * http://allmydata.com/.
- * 
- * 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.
  */
 
 /*

diff --git a/src/zfec/zfec/filefec.py b/src/zfec/zfec/filefec.py
index 47e4e0fa1d8202191b3d4d254889e97f8c5a1e0e..1419ae8e12ddbf48bfcd12e37fb246aa6b305013 100644 (file)
--- a/src/zfec/zfec/filefec.py
+++ b/src/zfec/zfec/filefec.py
@@ -428,8 +428,3 @@ def encode_file_stringy_easyfec(inf, cb, k, m, chunksize=4096):
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/test/test_util.py b/src/zfec/zfec/test/test_util.py
index c555e6c4b3c1cc5fb057eb2bb22cbdfa0979a8c3..18ad3c7df81941e712c010609ffc979156ba2dce 100644 (file)
--- a/src/zfec/zfec/test/test_util.py
+++ b/src/zfec/zfec/test/test_util.py
@@ -126,8 +126,3 @@ class Math(unittest.TestCase):
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/test/test_zfec.py b/src/zfec/zfec/test/test_zfec.py
index 3a76ddfe238ad0d122619c11f373f18bac2c37a1..b997fa166716505071c4cae02765ed47df834342 100644 (file)
--- a/src/zfec/zfec/test/test_zfec.py
+++ b/src/zfec/zfec/test/test_zfec.py
@@ -241,8 +241,3 @@ class Cmdline(unittest.TestCase):
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/util/fileutil.py b/src/zfec/zfec/util/fileutil.py
index 87fe7b03b3ab028a6fac46dd552296c23c2fe973..79d98592d25851a052b67627f207a10f9a6148ba 100644 (file)
--- a/src/zfec/zfec/util/fileutil.py
+++ b/src/zfec/zfec/util/fileutil.py
@@ -255,8 +255,3 @@ def remove_if_possible(f):
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/util/mathutil.py b/src/zfec/zfec/util/mathutil.py
index 160a7df37212661f599fb98094d1639a56bf838b..caf7b1eed28a8ecfbb4389843a543d0e2266fed6 100644 (file)
--- a/src/zfec/zfec/util/mathutil.py
+++ b/src/zfec/zfec/util/mathutil.py
@@ -89,8 +89,3 @@ def permute(l):
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit
 # http://allmydata.com/.
-# 
-# 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.

diff --git a/src/zfec/zfec/util/version.py b/src/zfec/zfec/util/version.py
index 6851becf8efbb7c43e96edd6542e545fb16155a9..d5cbb36cd2d9c6c76b15e465baa37805e4dc80db 100644 (file)
--- a/src/zfec/zfec/util/version.py
+++ b/src/zfec/zfec/util/version.py
@@ -1,3 +1,10 @@
+# Copyright (c) 2004-2007 Bryce "Zooko" Wilcox-O'Hearn
+# mailto:zooko@zooko.com
+# http://zooko.com/repos/pyutil
+# 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).
+
 """
 extended version number class
 """
@@ -120,27 +127,3 @@ class Version:
             return res
 
         return cmp(self.tags, other.tags)
-
-# zfec -- fast forward error correction library with Python interface
-# 
-# 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), 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
-# http://allmydata.com/.
-# 
-# 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.