[MERGE] addons 16 survey

[odoo/odoo.git] / debian / control

diff --git a/debian/control b/debian/control
index 7c1da67..7a1bfb6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,10 @@ Source: openerp
 Section: net
 Priority: optional
 Maintainer: OpenERP SA <al@openerp.com>
-Build-Depends: debhelper (>= 7.0.50~), python
-Build-Depends-Indep:
- python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2,
- python-reportlab
+Build-Depends: debhelper (>= 7.0.50~), python, rsync
 Standards-Version: 3.9.1
 Homepage: http://www.openerp.com/
-Vcs-Bzr: https://code.launchpad.net/openobject
+Vcs-Bzr: https://launchpad.net/openobject
 
 Package: openerp
 Section: net
@@ -19,12 +16,15 @@ Depends:
  python,
  postgresql-client,
  python-dateutil,
+ python-docutils,
+ python-feedparser,
  python-gdata,
  python-ldap,
  python-libxslt1,
  python-lxml,
  python-mako,
  python-openid,
+ python-psutil,
  python-psycopg2,
  python-pybabel,
  python-pychart,
@@ -33,13 +33,15 @@ Depends:
  python-reportlab,
  python-simplejson,
  python-tz,
+ python-vatnumber,
  python-vobject,
  python-webdav,
  python-werkzeug,
+ python-xlwt,
  python-yaml,
  python-zsi
-Conflicts: tinyerp-server, openerp-server
-Replaces: tinyerp-server, openerp-server
+Conflicts: tinyerp-server, openerp-server, openerp-web
+Replaces: tinyerp-server, openerp-server, openerp-web
 Recommends:
  graphviz, ghostscript, postgresql, python-imaging, python-matplotlib
 Description: OpenERP Enterprise Resource Management