From 75ce246725fd2ba0a94d5bd2e9a1258372bd821c Mon Sep 17 00:00:00 2001
From: zooko <zooko@zooko.com>
Date: Fri, 27 Apr 2007 04:22:16 +0530
Subject: [PATCH] zfec: tweak licence text for clarity

darcs-hash:8b7cacb77533d44552877a3424fcbcaef17e4d4f
---
 zfec/setup.py               |  6 +++---
 zfec/zfec/_fecmodule.c      | 22 +++++++++++-----------
 zfec/zfec/cmdline_zfec.py   |  8 ++++----
 zfec/zfec/cmdline_zunfec.py |  8 ++++----
 zfec/zfec/easyfec.py        |  6 +++---
 zfec/zfec/fec.c             |  8 ++++----
 zfec/zfec/fec.h             |  8 ++++----
 zfec/zfec/filefec.py        |  8 ++++----
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/zfec/setup.py b/zfec/setup.py
index aa300c6..cb5625d 100755
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -13,9 +13,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.  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.
+# 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
diff --git a/zfec/zfec/_fecmodule.c b/zfec/zfec/_fecmodule.c
index c6840cd..4a156a7 100644
--- a/zfec/zfec/_fecmodule.c
+++ b/zfec/zfec/_fecmodule.c
@@ -593,18 +593,18 @@ init_fec(void) {
  *
  * 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.  This program 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.
+ * 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.  This license 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.
  *
- * 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.
+ * 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
diff --git a/zfec/zfec/cmdline_zfec.py b/zfec/zfec/cmdline_zfec.py
index 07e8023..5c62fa8 100755
--- a/zfec/zfec/cmdline_zfec.py
+++ b/zfec/zfec/cmdline_zfec.py
@@ -70,10 +70,10 @@ def main():
 # 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.  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.
+# any later version.  This license 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.
 # 
 # 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/zfec/zfec/cmdline_zunfec.py b/zfec/zfec/cmdline_zunfec.py
index c3dc51f..70b6e04 100755
--- a/zfec/zfec/cmdline_zunfec.py
+++ b/zfec/zfec/cmdline_zunfec.py
@@ -64,10 +64,10 @@ def main():
 # 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.  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.
+# any later version.  This license also comes with the added permission that,
+# if 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.
 # 
 # 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/zfec/zfec/easyfec.py b/zfec/zfec/easyfec.py
index d3b7836..97c7381 100644
--- a/zfec/zfec/easyfec.py
+++ b/zfec/zfec/easyfec.py
@@ -52,9 +52,9 @@ class Decoder(object):
 # 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.  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.
+# 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
diff --git a/zfec/zfec/fec.c b/zfec/zfec/fec.c
index de63110..4d64e29 100644
--- a/zfec/zfec/fec.c
+++ b/zfec/zfec/fec.c
@@ -563,10 +563,10 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*
  * 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.  This program 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.
+ * any later version.  This license 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.
  *
  * 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/zfec/zfec/fec.h b/zfec/zfec/fec.h
index 8d5ea97..40ae1dc 100644
--- a/zfec/zfec/fec.h
+++ b/zfec/zfec/fec.h
@@ -45,10 +45,10 @@ void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts
  * 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.  This program 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.
+ * any later version.  This license 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.
  * 
  * 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/zfec/zfec/filefec.py b/zfec/zfec/filefec.py
index 5590850..43b5ab9 100644
--- a/zfec/zfec/filefec.py
+++ b/zfec/zfec/filefec.py
@@ -421,10 +421,10 @@ def encode_file_stringy_easyfec(inf, cb, k, m, chunksize=4096):
 # 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.  This program 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.
+# any later version.  This license 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.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
2.45.2