[MERGE] latest trunk

[odoo/odoo.git] / debian / control

diff --git a/debian/control b/debian/control
index ca7131c..ce0d3df 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends:
  python,
  postgresql-client,
  python-dateutil,
+ python-feedparser,
  python-gdata,
  python-ldap,
  python-libxslt1,
@@ -30,13 +31,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