diff options
| -rw-r--r-- | debian/README.source | 37 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 31 | ||||
| -rw-r--r-- | debian/local/openerp-server.conf | 55 | ||||
| -rw-r--r-- | debian/openerp-server.config | 10 | ||||
| -rw-r--r-- | debian/openerp-server.docs | 2 | ||||
| -rw-r--r-- | debian/openerp-server.examples | 1 | ||||
| -rw-r--r-- | debian/openerp-server.links | 2 | ||||
| -rw-r--r-- | debian/openerp-server.postinst | 62 | ||||
| -rw-r--r-- | debian/openerp-server.postrm | 41 | ||||
| -rw-r--r-- | debian/openerp-server.preseed | 5 | ||||
| -rw-r--r-- | debian/openerp-server.templates | 9 | ||||
| -rw-r--r-- | debian/openerp.README.Debian (renamed from debian/openerp-server.README.Debian) | 0 | ||||
| -rw-r--r-- | debian/openerp.init (renamed from debian/openerp-server.init) | 0 | ||||
| -rw-r--r-- | debian/openerp.install (renamed from debian/openerp-server.install) | 0 | ||||
| -rw-r--r-- | debian/openerp.lintian-overrides (renamed from debian/openerp-server.lintian-overrides) | 0 | ||||
| -rw-r--r-- | debian/openerp.postinst | 40 | ||||
| -rw-r--r-- | debian/openerp.postrm | 26 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | openerp/release.py | 3 | ||||
| -rwxr-xr-x | setup.py | 79 |
21 files changed, 119 insertions, 293 deletions
diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 18b6b245bf0..00000000000 --- a/debian/README.source +++ /dev/null @@ -1,37 +0,0 @@ -Package Repositories --------------------- - -Backports for the current stable debian distribution as well as snapshots of -unreleased versions may be available in repositories listed on the maintainers -homepage. The current URL of the maintainer homepage can be seen in -debian/copyright. - - -Source Access -------------- - -You can obtain the sources of this package with: - - $ apt-get source ${PACKAGE} - -whereas '${PACKAGE}' has to be replaced with the actual name of the package. - -This package is maintained with the Git version control system. The current git -source tree can be obtained with: - - $ git clone ${GIT_URI} - -whereas '${GIT_URI}' has to be replaced with the actual URI for the Git -repository. The current Git URI can be seen in debian/control in the extracted -package sources. - -More information about Git can be found in the git-core package. - -This package may use the Quilt patch system to manage all modifications to the -upstream source. Changes, if any, are stored in the source package as diffs in -debian/diff and are applied during the build. Current modifications can be -applied to the source tree with: - - $ QUILT_PATCHES=debian/patches quilt push -a - -More information about Quilt can be found in the quilt package. diff --git a/debian/changelog b/debian/changelog index f9a2355cf62..0ee8e0e3295 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp (6.1-1) testing; urgency=low + + * New major version, new packaging. + + -- Antony Lesuisse <al@openerp.com> Sat, 01 Oct 2011 12:31:00 +0100 + openerp-server (6.0.2-1) testing; urgency=low * Using upstream version 6.0.2 diff --git a/debian/control b/debian/control index 11c98536526..2fdc8cf90f0 100644 --- a/debian/control +++ b/debian/control @@ -1,40 +1,29 @@ -Source: openerp-server +Source: openerp Section: net Priority: optional -Maintainer: OpenERP SA. <xrg@openerp.com> -Uploaders: Xrg <xrg@openerp.com> +Maintainer: OpenERP SA <al@openerp.com> Build-Depends: debhelper (>= 7.0.50~), python Build-Depends-Indep: python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2, python-reportlab Standards-Version: 3.9.1 Homepage: http://www.openerp.com/ -Vcs-Browser: http://git.hellug.gr/?p=xrg/openobject-server;a=summary -Vcs-Git: http://members.hellug.gr/xrg/repos/openobject-server -Vcs-Bzr: https://code.launchpad.net/openobject-server +Vcs-Bzr: https://code.launchpad.net/openobject -Package: openerp-server +Package: openerp Section: net Architecture: all Depends: - ${misc:Depends}, adduser, python, python-dateutil, python-libxslt1, - python-lxml, python-psycopg2, python-pydot, python-pychart, python-reportlab, - python-tz, python-pyparsing, python-yaml, python-mako, - postgresql-client (>=8.2) -Conflicts: tinyerp-server -Replaces: tinyerp-server + ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-libxslt1, python-lxml, python-mako, python-psycopg2, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml +Conflicts: tinyerp-server, openerp-server +Replaces: tinyerp-server, openerp-server Recommends: - graphviz, ghostscript, postgresql, python-imaging, - python-matplotlib -Suggests: openerp-client -Description: Enterprise Resource Management (server) - Open ERP, previously known as TinyERP, is a complete ERP and CRM. The main + graphviz, ghostscript, postgresql, python-imaging, python-matplotlib +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 purchases management, tasks automation, marketing campaigns, help desk, POS, etc. Technical features include a distributed server, flexible workflows, an object database, a dynamic GUI, customizable reports, and NET-RPC and XML-RPC interfaces. - . - This package contains the Open ERP server, install openerp-client package for - the client. diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf deleted file mode 100644 index ffb6ed49db3..00000000000 --- a/debian/local/openerp-server.conf +++ /dev/null @@ -1,55 +0,0 @@ -# /etc/openerp-server.conf(5) - configuration file for openerp-server(1) - -[options] -# Enable the debugging mode (default False). -verbose = False -debug_mode = False - -# The file where the server pid will be stored (default False). -#pidfile = /var/run/openerp.pid - -# The file where the server log will be stored (default False). -logfile = /var/log/openerp-server.log - -# The unix account on behalf openerp is running. -process_user = openerp - -# The IP address on which the server will bind. -# If empty, it will bind on all interfaces (default empty). -interface = localhost - -# The TCP port on which the server will listen (default 8069). -#port = 8070 - -# Enable debug mode (default False). -debug_mode = False - -# Launch server over https instead of http (default False). -secure = False - -# Specify the SMTP server for sending email (default localhost). -smtp_server = localhost - -# Specify the SMTP user for sending email (default False). -smtp_user = False - -# Specify the SMTP password for sending email (default False). -smtp_password = False - -# Specify the database name. -#db_name = openerp - -# Specify the database user name (default None). -db_user = openerp - -# Specify the database password for db_user (default None). -db_password = - -# Specify the database host (default localhost). -db_host = - -# Specify the database port (default None). -db_port = 5432 - -# Specify the price accuracy. -#price_accuracy = diff --git a/debian/openerp-server.config b/debian/openerp-server.config deleted file mode 100644 index cf081ab3861..00000000000 --- a/debian/openerp-server.config +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -db_input low openerp-server/username || true -db_go - -db_stop diff --git a/debian/openerp-server.docs b/debian/openerp-server.docs deleted file mode 100644 index d5ad552bfce..00000000000 --- a/debian/openerp-server.docs +++ /dev/null @@ -1,2 +0,0 @@ -doc/migrate -doc/tests diff --git a/debian/openerp-server.examples b/debian/openerp-server.examples deleted file mode 100644 index c7f075ec127..00000000000 --- a/debian/openerp-server.examples +++ /dev/null @@ -1 +0,0 @@ -debian/openerp-server.preseed diff --git a/debian/openerp-server.links b/debian/openerp-server.links deleted file mode 100644 index 67620d22397..00000000000 --- a/debian/openerp-server.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/man/man5/openerp_serverrc.5.gz /usr/share/man/man5/openerp-server.conf.5.gz -/var/lib/openerp-server/filestore /usr/lib/openerp-server/filestore diff --git a/debian/openerp-server.postinst b/debian/openerp-server.postinst deleted file mode 100644 index a1e5317b8fc..00000000000 --- a/debian/openerp-server.postinst +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -CONFFILE="/etc/openerp-server.conf" -LOGFILE="/var/log/openerp-server.log" - -case "${1}" in - configure) - db_version 2.0 - - db_get openerp-server/username - _USERNAME="${RET:-openerp}" - - db_stop - - if ! getent passwd | grep -q "^${_USERNAME}" - then - adduser --system --no-create-home --quiet --gecos 'Open ERP server' --group ${_USERNAME} - else - echo "Open ERP user (${_USERNAME}) already exists, doing nothing." - fi - - sed -i -e "s|^process_user.*$|process_user = ${_USERNAME}|" ${CONFFILE} - - # Creating log file - touch ${LOGFILE} - chown ${_USERNAME}:adm ${LOGFILE} - chmod 0640 ${LOGFILE} - - # Creating local storage directory - mkdir -p /var/lib/openerp-server/filestore - - # Setting ownership and permissions - chmod 0640 ${CONFFILE} - chown ${_USERNAME}:${_USERNAME} ${CONFFILE} - chown ${_USERNAME}:${_USERNAME} /var/lib/openerp-server -R - - echo - echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" - echo "* Open ERP uses a PostgreSQL database to store its data. With the first *" - echo "* generation of packages, you have to setup this database manually. *" - echo "* Please read /usr/share/doc/openerp-server/README.Debian how to do it. *" - echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" - echo - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`{$1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm deleted file mode 100644 index 02b3d0a6817..00000000000 --- a/debian/openerp-server.postrm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - remove) - _USERNAME="openerp" - _GROUPNAME="openerp" - - if [ -x /usr/sbin/deluser ] - then - deluser --quiet --system ${_USERNAME} - fi - - if [ -x /usr/sbin/delgroup ] - then - delgroup --quiet --system --only-if-empty ${_GROUPNAME} || true - fi - - rm -f /usr/lib/openerp-server/addons/__init__.pyc - rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server/addons || true - rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server || true - ;; - - purge) - rm -rf /var/lib/openerp-server - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; - - *) - echo "postrm called with unknown argument \`${1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/openerp-server.preseed b/debian/openerp-server.preseed deleted file mode 100644 index 66d1a4ab95d..00000000000 --- a/debian/openerp-server.preseed +++ /dev/null @@ -1,5 +0,0 @@ -################################################################################ -## openerp-server - -#openerp-server openerp-server/username string openerp -################################################################################ diff --git a/debian/openerp-server.templates b/debian/openerp-server.templates deleted file mode 100644 index 985bd24abd9..00000000000 --- a/debian/openerp-server.templates +++ /dev/null @@ -1,9 +0,0 @@ -Template: openerp-server/username -Type: string -Default: openerp -_Description: Dedicated system account for the Open ERP server: - The Open ERP server must use a dedicated account for its operation so that - the system's security is not compromised by running it with superuser - privileges. - . - Please choose that account's username. diff --git a/debian/openerp-server.README.Debian b/debian/openerp.README.Debian index af298134af8..af298134af8 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp.README.Debian diff --git a/debian/openerp-server.init b/debian/openerp.init index ad8cbecb07c..ad8cbecb07c 100644 --- a/debian/openerp-server.init +++ b/debian/openerp.init diff --git a/debian/openerp-server.install b/debian/openerp.install index 78a4a648a06..78a4a648a06 100644 --- a/debian/openerp-server.install +++ b/debian/openerp.install diff --git a/debian/openerp-server.lintian-overrides b/debian/openerp.lintian-overrides index 25b1165c4be..25b1165c4be 100644 --- a/debian/openerp-server.lintian-overrides +++ b/debian/openerp.lintian-overrides diff --git a/debian/openerp.postinst b/debian/openerp.postinst new file mode 100644 index 00000000000..bbeee2a15f7 --- /dev/null +++ b/debian/openerp.postinst @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule + +CONFFILE="/etc/openerp.conf" +FILESTORE="/var/lib/openerp/filestore" +LOGFILE="/var/log/openerp.log" +USERNAME="openerp" + +case "${1}" in + configure) + if ! getent passwd | grep -q "^${USERNAME}" then + adduser --system --no-create-home --quiet --gecos 'OpenERP' --group ${USERNAME} + fi + # Creating log file + touch ${LOGFILE} + chown ${USERNAME}:${USERNAME} ${LOGFILE} + chmod 0640 ${LOGFILE} + # Creating local storage directory + mkdir -p ${FILESTORE} + # Setting ownership and permissions + chmod 0640 ${CONFFILE} + chown ${_USERNAME}:${_USERNAME} ${CONFFILE} + chown ${_USERNAME}:${_USERNAME} /var/lib/openerp -R + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`{$1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/openerp.postrm b/debian/openerp.postrm new file mode 100644 index 00000000000..0e5014dc9c8 --- /dev/null +++ b/debian/openerp.postrm @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +case "${1}" in + remove) + deluser --quiet --system "openerp" || true + delgroup --quiet --system --only-if-empty "openerp" || true + ;; + + purge) + rm -rf /var/lib/openerp-server + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 30ce14141e4..52d395fd86e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,5 @@ EXTRA_MODULES_PATH ?= ../addons %: dh ${@} -override_dh_installchangelogs: - dh_installchangelogs doc/Changelog - override_dh_installinit: dh_installinit --update-rcd-params='defaults 21' diff --git a/openerp/release.py b/openerp/release.py index c0c14099d33..dd338902757 100644 --- a/openerp/release.py +++ b/openerp/release.py @@ -19,7 +19,6 @@ # ############################################################################## -name = 'openerp-server' version = '6.1-dev' major_version = '6.1' description = 'OpenERP Server' @@ -36,7 +35,7 @@ Programming Language :: Python url = 'http://www.openerp.com' author = 'OpenERP S.A.' author_email = 'info@openerp.com' -support_email = 'support@openerp.com' license = 'AGPL-3' +timestamp = None # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: @@ -23,33 +23,6 @@ import glob, os, re, setuptools, sys from os.path import join, isfile -execfile(join('openerp', 'release.py')) - -py2exe_keywords = {} -if os.name == 'nt': - import py2exe - py2exe_keywords['console'] = [ - { "script": "openerp-server", - "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], - }] - py2exe_keywords['options'] = { - "py2exe": { - "skip_archive": 1, - "optimize": 2, - "dist_dir": 'dist', - "packages": [ - "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", - "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath", - "encodings", "dateutil", "pychart", "PIL", "pyparsing", - "pydot", "asyncore","asynchat", "reportlab", "vobject", - "HTMLParser", "select", "mako", "poplib", - "imaplib", "smtplib", "email", "yaml", "DAV", - "uuid", "commands", "openerp", "simplejson", "vatnumber" - ], - "excludes" : ["Tkconstants","Tkinter","tcl"], - } - } - # List all data files def data(): files = [] @@ -71,8 +44,30 @@ def gen_manifest(): file_list="\n".join(data()) open('MANIFEST','w').write(file_list) +def py2exe_options(): + if os.name == 'nt': + import py2exe + return { + "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }], + 'options' : { + "py2exe": { + "skip_archive": 1, + "optimize": 2, + "dist_dir": 'dist', + "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber" "vobject", "xml", "xml", "xml.dom", "xml.xpath", "yaml", ], + "excludes" : ["Tkconstants","Tkinter","tcl"], + } + } + } + else: + return {} + +execfile(join(os.path.dirname(__file__), 'openerp', 'release.py')) +if timestamp: + version = version + "-" + timestamp + setuptools.setup( - name = name, + name = 'openerp', version = version, description = description, long_description = long_desc, @@ -86,31 +81,29 @@ setuptools.setup( packages = setuptools.find_packages(), #include_package_data = True, install_requires = [ - # We require the same version as caldav for lxml. - 'lxml==2.1.5', - 'mako', - 'python-dateutil', - 'psycopg2', # TODO the pychart package we include in openerp corresponds to PyChart 1.37. # It seems there is a single difference, which is a spurious print in generate_docs.py. # It is probably safe to move to PyChart 1.39 (the latest one). # (Let setup.py choose the latest one, and we should check we can remove pychart from - # our tree.) - # http://download.gna.org/pychart/ - 'pychart', + # our tree.) http://download.gna.org/pychart/ + # TODO 'pychart', + 'feedparser', + 'lxml', + 'mako', + 'psycopg2', 'pydot', + 'python-dateutil', 'pytz', - 'reportlab', - 'caldav', - 'pyyaml', 'pywebdav', - 'feedparser', - 'simplejson >= 2.0', - 'vatnumber', # required by base_vat module + 'pyyaml', + 'reportlab', + 'simplejson', + 'vatnumber', # recommended by base_vat + 'werkzeug', ], extras_require = { 'SSL' : ['pyopenssl'], }, - **py2exe_keywords + **py2exe_options() ) |