diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2013-04-04 15:07:04 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2013-04-04 15:07:04 +0200 |
| commit | 307ca374d63e3fda0b9310c6315f64326ce05a8f (patch) | |
| tree | eab9b8a48debdfdb68b0655e519d7269c09e63ca /debian/control | |
| parent | b207801acc5daa3c1244f9a0321fa1caaf8ca07e (diff) | |
| parent | 5a4be3d44c27fb949495b77fa217c79dd6424f2a (diff) | |
[MERGE] forward merge 7.0 until revision 4919.
bzr revid: vmt@openerp.com-20130404130704-24vsmczw34cssytd
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/control b/debian/control index d4cf0c3f45e..a4c1b050c0a 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Depends: python-docutils, python-feedparser, python-gdata, + python-imaging, python-jinja2, python-ldap, python-libxslt1, @@ -46,7 +47,7 @@ Depends: Conflicts: tinyerp-server, openerp-server, openerp-web Replaces: tinyerp-server, openerp-server, openerp-web Recommends: - graphviz, ghostscript, postgresql, python-imaging, python-matplotlib + graphviz, ghostscript, postgresql, python-matplotlib, poppler-utils Description: OpenERP Enterprise Resource Management OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main features are accounting (analytic and financial), stock management, sales and |