Merge branch 'some-bug-fixes' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index cb6a3a81de66cccfc1ffa5a4abe3556b0527c4d1..669cfaee60174696d59d2485f29cb4ab9aa7810d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,39 @@
 #!/usr/bin/env python2
 
 from setuptools import setup
+import sys
 
-setup(name='FDroidServer',
-      version='0.1',
+setup(name='fdroidserver',
+      version='0.2.1',
       description='F-Droid Server Tools',
       long_description=open('README').read(),
       author='The F-Droid Project',
-      author_email='admin@f-droid.org',
-      url='http://f-droid.org',
+      author_email='team@f-droid.org',
+      url='https://f-droid.org',
       packages=['fdroidserver'],
-      scripts=['fdroid'],
+      scripts=['fdroid', 'fd-commit'],
       data_files=[
-        ('share/doc/fdroidserver/examples',
-         ['config.buildserver.py', 'config.sample.py', 'makebs.config.sample.py',
-          'fdroid-icon.png']),
-        ],
+          (sys.prefix + '/share/doc/fdroidserver/examples',
+              ['buildserver/config.buildserver.py',
+                  'examples/config.py',
+                  'examples/makebs.config.py',
+                  'examples/opensc-fdroid.cfg',
+                  'examples/fdroid-icon.png']),
+          ],
       install_requires=[
-        'python-magic',
-        'PIL',
-        ],
+          'mwclient',
+          'paramiko',
+          'Pillow',
+          'python-magic',
+          'apache-libcloud >= 0.14.1',
+          'pyasn1',
+          'pyasn1-modules',
+          ],
       classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
-        'Operating System :: POSIX',
-        'Topic :: Utilities',
-        ],
+          'Development Status :: 3 - Alpha',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+          'Operating System :: POSIX',
+          'Topic :: Utilities',
+          ],
       )