update setup and MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
index 9ad4098..01f23b4 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -11,16 +11,7 @@ recursive-include aes *.py
 include app.fil
 include icons.qrc
 recursive-include icons *
-include scripts
-include scripts/blocks
-include scripts/get_history
-include scripts/merchant.conf.template
-include scripts/merchant.py
-include scripts/merchant.readme
-include scripts/peers
-include scripts/servers
-include scripts/validate_tx
-include scripts/watch_address
+recursive-include scripts *
 recursive-include data *
 recursive-include locale *.mo
 recursive-include docs *

diff --git a/make_packages b/make_packages
index 42daa2e..9af348c 100755 (executable)
--- a/make_packages
+++ b/make_packages
@@ -25,7 +25,7 @@ if __name__ == '__main__':
     shutil.copytree("aes",'dist/e4a-%s/aes'%version)
     shutil.copytree("lib",'dist/e4a-%s/lib'%version)
     os.mkdir('dist/e4a-%s/gui'%version)
-    for n in ['gui_android.py', 'pyqrnative.py', 'bmp.py']:
+    for n in ['android.py']:
         shutil.copy("gui/%s"%n,'dist/e4a-%s/gui'%version)
     open('dist/e4a-%s/gui/__init__.py'%version,'w').close()
 

diff --git a/setup.py b/setup.py
index 6ce35e2..238efd0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 # python setup.py sdist --format=zip,gztar
 
-from distutils.core import setup
+from setuptools import setup
 import os, sys, platform, imp
 
 version = imp.load_source('version', 'lib/version.py')
@@ -49,7 +49,7 @@ data_files += [
 
 setup(name = "Electrum",
     version = version.ELECTRUM_VERSION,
-    install_requires = ['slowaes','ecdsa'],
+    install_requires = ['slowaes','ecdsa>=0.9'],
     package_dir = {'electrum': 'lib', 'electrum_gui': 'gui', 'electrum_plugins':'plugins'},
     scripts= ['electrum'],
     data_files = data_files,