--- a/setup.py	Mon Nov 07 03:22:15 2011 +0000
+++ b/setup.py	Thu Jun 28 19:26:50 2012 +0000
@@ -1,55 +1,67 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright 2007 - 2010, Pascal Volk
+# Copyright 2007 - 2012, Pascal Volk
 # See COPYING for distribution information.
 
 import os
 from distutils.core import setup
+from distutils.dist import DistributionMetadata
 
 VERSION = '0.5.2'
 
+descr = 'Tool to manage mail domains/accounts/aliases for Dovecot and Postfix'
 long_description = """
 vmm, a virtual mail manager, is a command line tool for
 administrators/postmasters to manage (alias-)domains, accounts,
 aliases and relocated users.
 It is designed for Dovecot and Postfix with a PostgreSQL backend.
 """
+packages = [
+    'VirtualMailManager',
+    'VirtualMailManager.cli',
+    'VirtualMailManager.ext',
+    'VirtualMailManager.pycompat',
+]
+# http://pypi.python.org/pypi?%3Aaction=list_classifiers
+classifiers = ['Development Status :: 5 - Production/Stable',
+               'Environment :: Console',
+               'Intended Audience :: System Administrators',
+               'License :: OSI Approved :: BSD License',
+               'Natural Language :: Dutch',
+               'Natural Language :: English',
+               'Natural Language :: French',
+               'Natural Language :: German',
+               'Operating System :: POSIX',
+               'Operating System :: POSIX :: BSD',
+               'Operating System :: POSIX :: Linux',
+               'Operating System :: POSIX :: Other',
+               'Programming Language :: Python',
+               'Programming Language :: Python :: 2',
+               'Topic :: Communications :: Email',
+               'Topic :: System :: Systems Administration',
+               'Topic :: Utilities']
+
+# sucessfuly tested on:
+platforms = ['freebsd7', 'linux2', 'openbsd4']
 
 # remove existing MANIFEST
 if os.path.exists('MANIFEST'):
     os.remove('MANIFEST')
 
+setup_args = {'name': 'VirtualMailManager',
+              'version': VERSION,
+              'description': descr,
+              'long_description': long_description,
+              'packages': packages,
+              'author': 'Pascal Volk',
+              'author_email': 'user+vmm@localhost.localdomain.org',
+              'license': 'BSD License',
+              'url': 'http://vmm.localdomain.org/',
+              'download_url':'http://sf.net/projects/vmm/files/',
+              'platforms': platforms,
+              'classifiers': classifiers}
 
-setup(name='VirtualMailManager',
-      version=VERSION,
-      description='Tool to manage mail domains/accounts/aliases for Dovecot and Postfix',
-      long_description=long_description,
-      packages=['VirtualMailManager', 'VirtualMailManager.ext',
-          'VirtualMailManager.constants'],
-      author='Pascal Volk',
-      author_email='neverseen@users.sourceforge.net',
-      license='BSD License',
-      url='http://vmm.localdomain.org/',
-      download_url='http://sf.net/projects/vmm/files/',
-      platforms=['freebsd7', 'linux2', 'openbsd4'],
-      classifiers=[
-          'Development Status :: 4 - Beta',
-          'Development Status :: 5 - Production/Stable',
-          'Environment :: Console',
-          'Intended Audience :: System Administrators',
-          'License :: OSI Approved :: BSD License',
-          'Natural Language :: Dutch',
-          'Natural Language :: English',
-          'Natural Language :: French',
-          'Natural Language :: German',
-          'Operating System :: POSIX',
-          'Operating System :: POSIX :: BSD',
-          'Operating System :: POSIX :: Linux',
-          'Operating System :: POSIX :: Other',
-          'Programming Language :: Python',
-          'Topic :: Communications :: Email',
-          'Topic :: System :: Systems Administration',
-          'Topic :: Utilities'
-      ],
-      requires=['pyPgSQL']
-      )
+if 'requires' in DistributionMetadata._METHOD_BASENAMES:
+    setup_args['requires'] = ['psycopg2 (>=2.0)', 'pyPgSQL (>=2.5.1)']
+
+setup(**setup_args)