projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MERGE] addons 16 survey
[odoo/odoo.git]
/
debian
/
control
diff --git
a/debian/control
b/debian/control
index
8b404a2
..
7a1bfb6
100644
(file)
--- a/
debian/control
+++ b/
debian/control
@@
-16,6
+16,7
@@
Depends:
python,
postgresql-client,
python-dateutil,
python,
postgresql-client,
python-dateutil,
+ python-docutils,
python-feedparser,
python-gdata,
python-ldap,
python-feedparser,
python-gdata,
python-ldap,
@@
-23,6
+24,7
@@
Depends:
python-lxml,
python-mako,
python-openid,
python-lxml,
python-mako,
python-openid,
+ python-psutil,
python-psycopg2,
python-pybabel,
python-pychart,
python-psycopg2,
python-pybabel,
python-pychart,
@@
-35,6
+37,7
@@
Depends:
python-vobject,
python-webdav,
python-werkzeug,
python-vobject,
python-webdav,
python-werkzeug,
+ python-xlwt,
python-yaml,
python-zsi
Conflicts: tinyerp-server, openerp-server, openerp-web
python-yaml,
python-zsi
Conflicts: tinyerp-server, openerp-server, openerp-web