[IMP] packaging depends

bzr revid: al@openerp.com-20111001164914-34dwbgb94beshlls

2 files changed, 14 insertions, 17 deletions

diff --git a/debian/control b/debian/control
index 5c518d5363d..2fdc8cf90f0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,7 @@ Package: openerp
 Section: net
 Architecture: all
 Depends:
- ${misc:Depends}, adduser, python, python-dateutil, python-libxslt1,
- python-lxml, python-psycopg2, python-pydot, python-pychart, python-reportlab,
- python-tz, python-pyparsing, python-yaml, python-mako, postgresql-client
+ ${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
 Conflicts: tinyerp-server, openerp-server
 Replaces: tinyerp-server, openerp-server
 Recommends:
diff --git a/setup.py b/setup.py
index 482284e7c5a..4d5b742d4cb 100755
--- a/setup.py
+++ b/setup.py
@@ -81,27 +81,26 @@ setuptools.setup(
       packages         = setuptools.find_packages(),
       #include_package_data = True,
       install_requires = [
-       # We require the same version as caldav for lxml.
-          'lxml==2.1.5',
-          'mako',
-          'python-dateutil',
-          'psycopg2',
         # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
         # It seems there is a single difference, which is a spurious print in generate_docs.py.
         # It is probably safe to move to PyChart 1.39 (the latest one).
         # (Let setup.py choose the latest one, and we should check we can remove pychart from
-        # our tree.)
-        # http://download.gna.org/pychart/
-          'pychart',
+        # our tree.) http://download.gna.org/pychart/
+        # TODO  'pychart',
+          'caldav',
+          'feedparser',
+          'lxml',
+          'mako',
+          'psycopg2',
           'pydot',
+          'python-dateutil',
           'pytz',
-          'reportlab',
-          'caldav',
-          'pyyaml',
           'pywebdav',
-          'feedparser',
-          'simplejson >= 2.0',
-          'vatnumber', # required by base_vat module
+          'pyyaml',
+          'reportlab',
+          'simplejson',
+          'vatnumber', # recommended by base_vat
+          'werkzeug',
       ],
       extras_require = {
           'SSL' : ['pyopenssl'],