diff --git a/debian/control b/debian/control index aad5d284ddc..ae3a9dcdb79 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,8 @@ Section: net Priority: optional Maintainer: Odoo S.A. Uploaders: Aaron Bohy , Simon Lejeune -Build-Depends: debhelper (>= 9.0), python, rsync -X-Python-Version: 2.7 -Standards-Version: 3.9.5.0 +Build-Depends: debhelper (>= 9.2), dh-python, python3, rsync, python3-setuptools +Standards-Version: 3.9.8 Homepage: http://www.odoo.com/ Vcs-Git: https://github.com/odoo/odoo @@ -13,40 +12,38 @@ Package: odoo Architecture: all Depends: ${misc:Depends}, + ${python3:Depends}, adduser, + lsb-base, node-less, postgresql-client, - python, - python-babel, - python-dateutil, - python-decorator, - python-docutils, - python-feedparser, - python-imaging, - python-jinja2, - python-ldap, - python-libxslt1, - python-lxml, - python-mako, - python-mock, - python-openid, - python-passlib, - python-psutil, - python-psycopg2, - python-pychart, - python-pydot, - python-pyparsing, - python-pypdf2, - python-reportlab, - python-requests, - python-suds, - python-tz, - python-vatnumber, - python-vobject, - python-werkzeug, - python-xlsxwriter, - python-xlwt, - python-yaml, + python3-babel, + python3-dateutil, + python3-decorator, + python3-docutils, + python3-feedparser, + python3-html2text, + python3-pil, + python3-jinja2, + python3-lxml, + python3-mako, + python3-mock, + python3-openid, + python3-passlib, + python3-psutil, + python3-psycopg2, + python3-pydot, + python3-pyparsing, + python3-pypdf2, + python3-reportlab, + python3-requests, + python3-suds, + python3-tz, + python3-vatnumber, + python3-vobject, + python3-werkzeug, + python3-xlsxwriter, + python3-yaml, Conflicts: tinyerp-server, openerp-server, openerp-web, openerp Replaces: tinyerp-server, openerp-server, openerp-web, openerp Recommends: diff --git a/debian/odoo.conf b/debian/odoo.conf index b4abc443124..c85f59802d3 100644 --- a/debian/odoo.conf +++ b/debian/odoo.conf @@ -5,4 +5,4 @@ db_host = False db_port = False db_user = odoo db_password = False -addons_path = /usr/lib/python2.7/dist-packages/odoo/addons +;addons_path = /usr/lib/python3/dist-packages/odoo/addons diff --git a/debian/odoo.service b/debian/odoo.service new file mode 100644 index 00000000000..2d971ec3ae3 --- /dev/null +++ b/debian/odoo.service @@ -0,0 +1,13 @@ +[Unit] +Description=Odoo Open Source ERP and CRM +After=network.target + +[Service] +Type=simple +User=odoo +Group=odoo +ExecStart=/usr/bin/odoo --config /etc/odoo/odoo.conf --logfile /var/log/odoo/odoo-server.log + +[Install] +WantedBy=multi-user.target + diff --git a/debian/rules b/debian/rules index 68a3044ba16..1eea0e7ab49 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,7 @@ #!/usr/bin/make -f +export DH_VERBOSE=1 +export PYBUILD_NAME=odoo-bin +export PYBUILD_DISABLE=test %: - dh ${@} -Spython_distutils \ No newline at end of file + dh ${@} --with=python3,systemd --buildsystem=pybuild diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)