[merge] from trunk, including mako fix: removal of bundled mako, addition of mako to required modules

bzr revid: xmo@tinyerp.com-20091215205434-nbr6pexxb2av0wyy

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index b911976fea8..7ebf8ce5a76 100755
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ py_short_version = '%s.%s' % sys.version_info[:2]
 
 required_modules = [
     ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'),
+    ('mako', 'Mako template engine'),
     ('mx', "egenix's mx library for its extended DateTime module"),
     ('psycopg2', 'PostgreSQL module'),
     ('pychart', 'pychart module'),
@@ -195,7 +196,6 @@ setup(name             = name,
       packages         = ['openerp-server',
                           'openerp-server.addons',
                           'openerp-server.ir',
-                          'openerp-server.mako',
                           'openerp-server.osv',
                           'openerp-server.pychart',
                           'openerp-server.pychart.afm',