[MERGE] missing deps

bzr revid: al@openerp.com-20111001183819-loaezaoppq6i3dck

2 files changed, 4 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index 2fdc8cf90f0..17ff862e0a7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: openerp
 Section: net
 Architecture: all
 Depends:
- ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-libxslt1, python-lxml, python-mako, python-psycopg2, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
+ ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-ldap, python-libxslt1, python-lxml, python-mako, python-openid, python-psycopg2, python-pybabel, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
 Conflicts: tinyerp-server, openerp-server
 Replaces: tinyerp-server, openerp-server
 Recommends:
diff --git a/setup.py b/setup.py
index b42c99795b6..caca2f09889 100755
--- a/setup.py
+++ b/setup.py
@@ -87,12 +87,15 @@ setuptools.setup(
         # (Let setup.py choose the latest one, and we should check we can remove pychart from
         # our tree.) http://download.gna.org/pychart/
         # TODO  'pychart',
+          'babel',
           'feedparser',
           'lxml',
           'mako',
           'psycopg2',
           'pydot',
           'python-dateutil',
+          'python-ldap',
+          'python-openid',
           'pytz',
           'pywebdav',
           'pyyaml',