setup: update docs in setup code

darcs-hash:03c4b79f4fd45ca3dce4fe85be139a9dce3ebd30

diff --git a/zfec/README.txt b/zfec/README.txt
index e563ab6062218c163afaeac100470dfbbd2a3105..c91634698e46813dc7dd0c2c5e41a59b344c9674 100644 (file)
--- a/zfec/README.txt
+++ b/zfec/README.txt
@@ -8,7 +8,9 @@ Grace Period Public Licence, version 1.0.  (You may choose to use this package
 under the terms of either licence, at your option.)  See the file COPYING.GPL
 for the terms of the GNU General Public License, version 2.  See the file
 COPYING.TGPPL.html for the terms of the Transitive Grace Period Public Licence,
-version 1.0.
+version 1.0.  In addition, Allmydata, Inc. offers other licensing terms.  If you
+would like to inquire about a commercial relationship with Allmydata, Inc.,
+please contact partnerships@allmydata.com and visit http://allmydata.com .
 
 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 stored data
@@ -48,7 +50,6 @@ due to the fact that the interpreter cannot process FEC.hs as it takes a
 reference to an FFI function.
 
 
-
  * Community
 
 The source is currently available via darcs on the web with the command:

diff --git a/zfec/setup.py b/zfec/setup.py
index 3a0f3ecaa1f3baf7bd6e8f3fc74a046d60447f91..391c19c7ace1decc4aa4135fd42909ca4cc0a0ef 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -94,17 +94,16 @@ dependency_links=[os.path.join(miscdeps, t) for t in os.listdir(miscdeps) if t.e
 setup_requires = []
 
 # darcsver is needed only if you want "./setup.py darcsver" to write a new
-# version stamp in pycryptopp/_version.py, with a version number derived from
+# version stamp in zfec/_version.py, with a version number derived from
 # darcs history.  http://pypi.python.org/pypi/darcsver
 if "darcsver" in sys.argv[1:]:
     setup_requires.append('darcsver >= 1.0.0')
 
 # setuptools_darcs is required to produce complete distributions (such as with
-# "sdist" or "bdist_egg"), unless there is a PKG-INFO file present which shows
-# that this is itself a source distribution.
+# "sdist" or "bdist_egg"), unless there is a zfec.egg-info/SOURCE.txt file
+# present which contains a complete list of files that should be included.
 # http://pypi.python.org/pypi/setuptools_darcs
-if not os.path.exists('PKG-INFO'):
-    setup_requires.append('setuptools_darcs >= 1.0.5')
+setup_requires.append('setuptools_darcs >= 1.1.0')
 
 data_fnames=[ 'COPYING.GPL', 'changelog', 'COPYING.TGPPL.html', 'TODO', 'README.txt' ]
 

diff --git a/zfec/zfec/__init__.py b/zfec/zfec/__init__.py
index 71d24060c8e943a8913e37c22ac383d0636efd26..3b9b8dcbca9d76c38d4bf74684b717d07e5023ec 100644 (file)
--- a/zfec/zfec/__init__.py
+++ b/zfec/zfec/__init__.py
@@ -10,9 +10,9 @@ __version__ = "unknown"
 try:
     from _version import __version__
 except ImportError:
-    # We're running in a tree that hasn't run darcsver from the pyutil library,
-    # and didn't come with a _version.py, so we don't know what our version
-    # is. This should not happen very often.
+    # We're running in a tree that hasn't run darcsver, and didn't come with a
+    # _version.py, so we don't know what our version is. This should not happen
+    # very often.
     pass
 
 from _fec import Encoder, Decoder, Error