[MERGE] forward porting fixes from saas-3

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 4f4ffe6..05178fb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -125,17 +125,20 @@ setuptools.setup(
           'lxml', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'mako',
           'mock',
-          'PIL', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
+          'pillow', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'psutil', # windows binary code.google.com/p/psutil/downloads/list
           'psycopg2 >= 2.2',
           'pydot',
           'pyparsing < 2',
+          'pyserial',
           'python-dateutil < 2',
           'python-ldap', # optional
           'python-openid',
           'pytz',
+          'pyusb >= 1.0.0b1',
           'pywebdav',
           'pyyaml',
+          'qrcode',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab
           'simplejson',
           'unittest2',