Merge branch 'maint'

Conflicts:
	doc/appendix/guides/centos.txt
	doc/server/plugins/grouping/metadata.txt
	setup.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py
	src/sbin/bcfg2-lint

1 files changed, 14 insertions, 14 deletions

diff --git a/setup.py b/setup.py
index 3e75d3a02..8c93285e5 100755
--- a/setup.py
+++ b/setup.py
@@ -4,26 +4,26 @@ from setuptools import setup
 from glob import glob
 import sys
 
-vfile = 'src/lib/Bcfg2/version.py'
+version_file = 'src/lib/Bcfg2/version.py'
 try:
     # python 2
-    execfile(vfile)
+    execfile(version_file)
 except NameError:
     # py3k
-    exec(compile(open(vfile).read(), vfile, 'exec'))
+    exec(compile(open(version_file).read(), version_file, 'exec'))
 
-# we only need m2crypto on < python2.6
-need_m2crypto = False
-version = sys.version_info[:2]
-if version < (2, 6):
-    need_m2crypto = True
+inst_reqs = [
+    'lockfile',
+    'lxml',
+    'python-daemon',
+]
 
-inst_reqs = ['lxml', 'genshi']
-if need_m2crypto:
+# we only need m2crypto on < python2.6
+if sys.version_info[:2] < (2, 6):
     inst_reqs.append('M2Crypto')
 
 setup(name="Bcfg2",
-      version="1.3.1",
+      version=__version__,  # Defined in src/lib/Bcfg2/version.py
       description="Bcfg2 Server",
       author="Narayan Desai",
       author_email="desai@mcs.anl.gov",
@@ -52,9 +52,9 @@ setup(name="Bcfg2",
       install_requires=inst_reqs,
       tests_require=['mock', 'nose', 'sqlalchemy'],
       package_dir={'': 'src/lib', },
-      package_data={'Bcfg2.Reporting': [ 'templates/*.html',
-                                         'templates/*/*.html',
-                                         'templates/*/*.inc']},
+      package_data={'Bcfg2.Reporting': ['templates/*.html',
+                                        'templates/*/*.html',
+                                        'templates/*/*.inc']},
       scripts=glob('src/sbin/*'),
       data_files=[('share/bcfg2/schemas',
                    glob('schemas/*.xsd')),