zfec: tweak licence text for clarity

darcs-hash:8b7cacb77533d44552877a3424fcbcaef17e4d4f

diff --git a/zfec/setup.py b/zfec/setup.py
index aa300c65a6a0c1d1f56f3317db821df4a77978c8..cb5625da55fc4259998ed454c2f34b3e2abd1cdc 100755 (executable)
--- 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 c6840cd0c21a7049a4ec23471e209545fe439f31..4a156a7e8f3de033ff3c9fd10fddedd9636e7e57 100644 (file)
--- 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 07e80233f8d7dc4aaeb83907b21e3562cdd33e78..5c62fa869f3af6b5643e273efcc860d84e57769e 100755 (executable)
--- 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 c3dc51fb74d682fe9cb53422ea16f85c96a33733..70b6e04c37b6bd04bf073ec2c0205b5fbce21451 100755 (executable)
--- 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 d3b78362183a7d099b6a939c1066c36e3814e445..97c73814b937fb5ab28ae06edc737a8ca42e9675 100644 (file)
--- 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 de63110c8f62ff30f92b111ddf273168c6609975..4d64e29628d22e6ec470fa51560ef58ee453aab6 100644 (file)
--- 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 8d5ea97706518ebde3aec0638e6c006a89e4d32a..40ae1dc180cbed58a2392e67d09356ade43a9450 100644 (file)
--- 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 55908504126b29810a7492aefff5b7a4978ce973..43b5ab9bc353eae3734fd70d9dc2474393aec1dc 100644 (file)
--- 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