--- a/buildout.cfg	Fri Nov 18 00:23:31 2011 +0100
+++ b/buildout.cfg	Fri Nov 18 00:47:32 2011 +0100
@@ -6,15 +6,7 @@
 # install software
 [install]
 recipe = zc.recipe.egg
-eggs = 
-  distribute
-  Flask
-  WTForms
-  ordereddict
-  argparse
-  itsdangerous
-  python-dateutil < 2.0
-  ltpdarepo
+eggs = ltpdarepo
 interpreter = python
 scripts =
 

--- a/src/setup.py	Fri Nov 18 00:23:31 2011 +0100
+++ b/src/setup.py	Fri Nov 18 00:47:32 2011 +0100
@@ -1,10 +1,44 @@
 from setuptools import setup
 
-VERSION = '0.5dev'
+version = '0.5dev'
+
+requires = [
+    'distribute',
+    'Flask',
+    'WTForms',
+    'itsdangerous',
+    'python-dateutil < 2.0',
+]
+
+try:
+    import argparse
+except ImportError:
+    # we have python < 2.7
+    requires.append('argparse')
 
-setup(
-    name='ltpdarepo',
-    version=VERSION,
-    entry_points={'console_scripts': ['run = ltpdarepo:main',
-                                      'admin = ltpdarepo.admin:main',]}
-)
+try:
+    from collections import OrderedDict
+except ImportError:
+    # we have python < 2.7
+    requires.append('ordereddict')
+
+
+setup(name='ltpdarepo',
+      version=version,
+      keywords='',
+      author='Daniele Nicolodi',
+      author_email='nicolodi@science.unitn.it',
+      url='http://dev.grinta.net/hg/ltpdarepo/',
+      license='AGPLv3+',
+
+      packages=['ltpdarepo', ],
+      include_package_data=True,
+      package_data={'': ['*.txt', '*.rst', '*.sql']},
+      zip_safe=False,
+      install_requires=requires,
+      entry_points={
+          'console_scripts': [
+              'run = ltpdarepo:main',
+              'admin = ltpdarepo.admin:main', ]
+          }
+      )