From ec1066d54b1ca23e6c87876c01e82307d7950f60 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:37 +0300 Subject: [PATCH 01/66] Adding debian version 5.0.0~alpha-1. bzr revid: p_christ@hol.gr-20090421090637-ixcz4qjhsrc3419u --- debian/README.Debian | 44 ++ debian/changelog | 202 +++++++ debian/compat | 1 + debian/config/openerp-server.conf | 48 ++ debian/control | 27 + debian/copyright | 312 +++++++++++ debian/docs | 2 + debian/install | 1 + debian/links | 1 + debian/lintian-overrides | 3 + debian/openerp-server.init | 66 +++ debian/patches/00list | 4 + debian/patches/01-autobuild.dpatch | 19 + debian/patches/02-openerp.dpatch | 815 +++++++++++++++++++++++++++++ debian/patches/03-migrate.dpatch | 19 + debian/patches/04-shebang.dpatch | 25 + debian/postinst | 46 ++ debian/postrm | 28 + debian/rules | 62 +++ 19 files changed, 1725 insertions(+) create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/config/openerp-server.conf create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/install create mode 100644 debian/links create mode 100644 debian/lintian-overrides create mode 100644 debian/openerp-server.init create mode 100644 debian/patches/00list create mode 100644 debian/patches/01-autobuild.dpatch create mode 100644 debian/patches/02-openerp.dpatch create mode 100644 debian/patches/03-migrate.dpatch create mode 100644 debian/patches/04-shebang.dpatch create mode 100644 debian/postinst create mode 100644 debian/postrm create mode 100755 debian/rules diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000000..1fd378c7e72 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,44 @@ +openerp-server for Debian +------------------------- + +OpenERP uses a PostgreSQL database to store its data. With the first generation +of packages, you have to setup this database manually. Here is a short +explanation how to achieve this (you need to execute all commands as root): + + 0. Making sure, PostgreSQL is running + + # /etc/init.d/postgresql* restart + + 1. Creating the database + + # su - postgres -c "createdb -q --encoding=UNICODE openerp" + + 2. Creating the database user + + # su - postgres -c "createuser -q --createdb --adduser openerp" + + Note: If you want to run the database as another user than 'openerp', you need + to replace 'openerp' above with the user you want instead, and you need to + adjust 'db_user = openerp' in /etc/openerp-server.conf too. + + 3. Restarting openerp-server + + # /etc/init.d/openerp-server restart + +Now, you're finish. Please be aware of the following things: + + * openerp-server has by default two accounts: + - User: admin; password: admin + - User: demo; password; demo + + * openerp-server listens by default on port 8069. If you need to change this, + edit /etc/openerp-server.conf and replace 'port = 8069' with + 'port = '. + + * openerp-server in the upstreams configuration listens by default to *all* + interfaces. For security reasons, we do restrict it in the Debian packages + to listen only on localhost. If you need to change this, edit + /etc/openerp-server.conf and replace 'interface = localhost' with + 'interface = '. + + -- Daniel Baumann Fri, 1 Jun 2007 12:00:00 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000000..fdc15885f77 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,202 @@ +tinyerp-server (5.0.0~alpha-1) experimental; urgency=low + + * Merging upstream version 5.0.0~alpha. + * Rediffing autobuild.dpatch. + * Removing shebang.dpatch, not needed anymore. + * Removing python2.5.dpatch, not needed anymore. + * Rediffing openerp.dpatch. + * Rediffing migrate.dpatch. + * Not moving server to sbin anymore for the sake of consistency. + * Removing unneeded chmod call for tinyerp-server.py. + * Sorting build-depends, depends and recommends. + * Dropping /etc/default/tinyerp-server in favour of using + /etc/tinyerp-server.conf directly. + * Updating chmod call in rules to also cope with filenames that embedd + whitespaces. + * Adding patch to correct shebang in two addon files. + * Adding workaround for bug in setup.py that puts import_xml.rng into the + wrong location. + * Adding symlink for tinyerp_serverrc manpage to tinyerp-server.conf. + * Renaming everything except the package name itself from tinyerp-server to + openerp-server. + * Updating copyright file to current upstream. + + -- Daniel Baumann Sun, 9 Nov 2008 15:52:00 +0100 + +tinyerp-server (4.2.3.4-1) unstable; urgency=low + + * Merging upstream version 4.2.3.4. + * Upgrading package to debhelper 7. + * Upgrading package to standards 3.8.0. + * Updating homepage field in control file. + * Adding vcs fields in control file. + * Rewriting copyright file in machine-interpretable format. + * Using lintian debhelper to install lintian overrides. + * Removing bind-exit.dpatch, went upstream. + * Updating default database port. + * Adding logfile handling. + * Updating postresql recommends. + * Reordering and splitting out rules file into individual debhelper files. + * Applying some shell cosmetics to init and maintainer scripts. + * Adding patch to update homepage location of tinyerp. + * Setting ownership of addons directory in postinst (Closes: #487112). + * Adding patch from Brian DeRocher to fix sql syntax in + migrate script (Closes: #467517). + + -- Daniel Baumann Sun, 9 Nov 2008 09:11:00 +0100 + +tinyerp-server (4.2.2-2) unstable; urgency=medium + + * Readding depends to python-psycopg (Closes: #463079, #493374). + * Adding depends to python-tz (Closes: #482359). + + -- Daniel Baumann Sun, 3 Aug 2008 00:20:00 +0200 + +tinyerp-server (4.2.2-1) unstable; urgency=low + + * New upstream release (Closes: #477698). + * Dropping depends against python-xml (Closes: #468619). + + -- Daniel Baumann Sat, 26 Apr 2008 16:15:00 +0200 + +tinyerp-server (4.2.1-1) unstable; urgency=low + + * Maintainer upload from the Zuerich BSP. + * New upstream release. + * Bumping to new policy. + * Using new homepage field in control. + * Including documentation for migration and testing (Closes: #445464). + * Adjusting 04-bind-exit.dpatch to new upstream release. + * Added lintian overrides. + * Depending now on python-psycopg2, not python-psycopg anymore + (Closes: #445464). + + -- Daniel Baumann Sat, 12 Jan 2008 15:20:00 +0100 + +tinyerp-server (4.2.0-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann Wed, 31 Oct 2007 21:31:00 +0100 + +tinyerp-server (4.0.3-3) unstable; urgency=medium + + * Setting database port to 5433 (Closes: #443626). + * Applied patch from Aldrin Martoq to make tinyerp-server compatible with + python 2.5. + * Applied patch from Luca Falavigna to fix exception + raised when address is already in use. + + -- Daniel Baumann Sat, 29 Sep 2007 17:07:00 +0200 + +tinyerp-server (4.0.3-2) unstable; urgency=low + + * Check for existence of deluser in postrm (Closes: #431532). + + -- Daniel Baumann Tue, 3 Jul 2007 11:01:00 +0200 + +tinyerp-server (4.0.3-1) unstable; urgency=low + + * New upstream release. + * Taking package back, Jean-Marc seems to be MIA. + * Changed wording of 'listen to all interfaces' paragraph in README.Debian, + thanks to Gerfried Fuchs . + * Added lsb header to init script. + + -- Daniel Baumann Fri, 1 Jun 2007 11:59:00 +0200 + +tinyerp-server (4.0.2-3) unstable; urgency=low + + * Setting maintainer to Jean-Marc, this time really :) + + -- Daniel Baumann Wed, 28 Mar 2007 21:48:00 +0100 + +tinyerp-server (4.0.2-2) unstable; urgency=low + + * Setting maintainer to Jean-Marc. + + -- Daniel Baumann Wed, 7 Feb 2007 13:41:00 +0100 + +tinyerp-server (4.0.2-1) unstable; urgency=low + + * New upstream release. + * Some minor cleanups. + + -- Daniel Baumann Thu, 18 Jan 2007 14:19:00 +0100 + +tinyerp-server (4.0.1-1) unstable; urgency=low + + * New upstream release. + * Removed 03-setup.dpatch, went upstream. + + -- Daniel Baumann Fri, 29 Dec 2006 01:03:00 +0100 + +tinyerp-server (4.0.0-1) unstable; urgency=low + + * New upstream release. + * Added patch to fix a typo in setup.py. + + -- Daniel Baumann Tue, 5 Dec 2006 17:43:00 +0100 + +tinyerp-server (4.0.0~rc1-2) unstable; urgency=low + + * Cleaned up build-depends. + + -- Daniel Baumann Tue, 5 Dec 2006 13:19:00 +0100 + +tinyerp-server (4.0.0~rc1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 5 Dec 2006 12:57:00 +0100 + +tinyerp-server (3.5.0-1) experimental; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 23 Oct 2006 12:23:00 +0200 + +tinyerp-server (3.4.2-1) unstable; urgency=low + + * New upstream release. + * New email address. + * Complying with new python policy (Closes: #380973). + * Adjusted postgre depends (Closes: #376614). + + -- Daniel Baumann Mon, 16 Oct 2006 14:45:00 +0200 + +tinyerp-server (3.3.0-1) unstable; urgency=low + + * New upstream release (Closes: #369769): + - fixed installation script to install all needed files (Closes: #355224) + * Updated README.Debian (Closes: #352322, #360222, #360223). + * Set to architecture to all (Closes: #356962). + + -- Daniel Baumann Sun, 4 Jun 2006 00:50:00 +0100 + +tinyerp-server (3.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Thu, 2 Feb 2006 09:44:00 +0100 + +tinyerp-server (3.2.0-1) unstable; urgency=low + + * New upstream release. + * Adjusted shellbang in bin/addons/base/ir/workflow/pydot/dot_parser.py. + + -- Daniel Baumann Tue, 24 Jan 2006 07:00:00 +0100 + +tinyerp-server (3.1.99+3.2.0rc1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 27 Dec 2005 20:00:00 +0100 + +tinyerp-server (3.1.1+debian-1) unstable; urgency=low + + * Initial release (Closes: #301510). + * Rebuild orig.tar.gz to remove unnecessary files in upstreams debian/. + * Added changelog from website. + + -- Daniel Baumann Sun, 16 Oct 2005 13:35:00 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000000..7f8f011eb73 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/config/openerp-server.conf b/debian/config/openerp-server.conf new file mode 100644 index 00000000000..6e998262445 --- /dev/null +++ b/debian/config/openerp-server.conf @@ -0,0 +1,48 @@ +# /etc/openerp-server.conf(5) - configuration file for openerp-server(1) + +[options] +# Enable the debugging mode (default False). +verbose = 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.log + +# 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 = 8069 + +# 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 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000000..cb17a747d9f --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: tinyerp-server +Section: net +Priority: optional +Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 7), dpatch, python-dev +Build-Depends-Indep: python-libxml2, python-libxslt1, python-psycopg +Standards-Version: 3.8.0 +Homepage: http://www.openerp.com/ +Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git +Vcs-Git: git://git.debian.net/git/debian/openerp-server.git + +Package: tinyerp-server +Section: net +Architecture: all +Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz +Recommends: graphviz, postgresql, postgresql-client, python-imaging, python-pyparsing +Provides: openerp-server +Suggests: tinyerp-client +Description: Enterprise Resource Management (server) + OpenERP 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 OpenERP server, install tinyerp-client package for + the client. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000000..4bdf8e97d66 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,312 @@ +Author: Tiny.be +Download: http://www.openerp.com/ + +Files: * +Copyright: (C) 2004-2008 Tiny.be +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. + +Files: + bin/addons/gen_graph.sh + doc/migrate/* +Copyright: (C) 2004-2008 Tiny.be +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: + bin/addons/account/report/general_ledger.py + bin/addons/account/report/general_ledger_landscape.py + bin/addons/account/wizard/wizard_statement_from_invoice.py +Copyright: (C) 2005-2008 CamptoCamp +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: bin/addons/auction/barcode/* +Copyright: (C) 2000 Tyler C. Sarna +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Tyler C. Sarna. + 4. Neither the name of the author nor the names of contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Files: bin/addons/base/ir/workflow/pydot/* +Copyright: (C) 2004 Ero Carrera +License: other + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +Files: + bin/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl + bin/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py +Copyright: (C) 2005 Martin Simon +License: LGPL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Library General Public License + can be found in /usr/share/common-licenses/LGPL-2.1 file. + +Files: bin/addons/document/ftpserver/* +Copyright: + (C) 2007 Giampaolo Rodola + (C) 2008 Fabien Pinckaers +License: MIT + Permission to use, copy, modify, and distribute this software and + its documentation for any purpose and without fee is hereby + granted, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + Giampaolo Rodola' not be used in advertising or publicity pertaining to + distribution of the software without specific, written prior + permission. + . + Giampaolo Rodola' DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + NO EVENT Giampaolo Rodola' BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Files: bin/addons/hr_holidays/* +Copyright: + (C) 2004-2008 Tiny.be + (C) 2005-2006 Axelor SARL. +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: bin/addons/l10n_chart_uk_minimal/* +Copyright: + (C) 2004-2008 Tiny.be + (C) 2004-2008 Seath Solutions Ltd. +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: bin/pychart/* +Copyright: (C) 2000-2005 Yasushi Saito +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: bin/reportlab/* +Copyright: (C) 2000-2004 ReportLab Inc. +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the company nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE OFFICERS OR CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: bin/tools/threadinglocal.py +Copyright: (C) 2004-2005 CherryPy Team +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the CherryPy Team nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: bin/tools/decimal.py +Copyright: (C) 2004 Python Software Foundation. +License: other + This file is distributed under the Python Software License + (http://www.python.org/2.3/license.html). + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Stichting Mathematisch + Centrum or CWI not be used in advertising or publicity pertaining to + distribution of the software without specific, written prior + permission. + +Files: debian/* +Copyright: (C) 2005-2008 Daniel Baumann +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000000..d5ad552bfce --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +doc/migrate +doc/tests diff --git a/debian/install b/debian/install new file mode 100644 index 00000000000..28c56bcbac8 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +debian/config/* /etc/ diff --git a/debian/links b/debian/links new file mode 100644 index 00000000000..609d00a2036 --- /dev/null +++ b/debian/links @@ -0,0 +1 @@ +/usr/share/man/man5/openerp_serverrc.5.gz /usr/share/man/man5/openerp-server.conf.5.gz diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 00000000000..0586695f2e9 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,3 @@ +# Add-on directories needs data directories, and sometimes they are +# (intentionally) empty, hence overriting the lintian warning. +tinyerp-server: package-contains-empty-directory diff --git a/debian/openerp-server.init b/debian/openerp-server.init new file mode 100644 index 00000000000..5a0946e002d --- /dev/null +++ b/debian/openerp-server.init @@ -0,0 +1,66 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: openerp-server +# Required-Start: $syslog +# Required-Stop: $syslog +# Should-Start: $network +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Enterprise Resource Management software +# Description: OpenERP is a complete ERP and CRM software. +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/openerp-server +NAME=openerp-server +DESC=openerp-server + +test -x ${DAEMON} || exit 0 + +set -e + +case "${1}" in + start) + echo -n "Starting ${DESC}: " + + start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \ + --chuid ${USER} --background --make-pidfile \ + --exec ${DAEMON} -- --config=/etc/openerp-server.conf + + echo "${NAME}." + ;; + + stop) + echo -n "Stopping ${DESC}: " + + start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid \ + --oknodo + + echo "${NAME}." + ;; + + restart|force-reload) + echo -n "Restarting ${DESC}: " + + start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid \ + --oknodo + + sleep 1 + + start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \ + --chuid ${USER} --background --make-pidfile \ + --exec ${DAEMON} -- --config=/etc/openerp-server.conf + + echo "${NAME}." + ;; + + *) + N=/etc/init.d/${NAME} + echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 00000000000..536a3dfe7a3 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,4 @@ +01-autobuild.dpatch +02-openerp.dpatch +03-migrate.dpatch +04-shebang.dpatch diff --git a/debian/patches/01-autobuild.dpatch b/debian/patches/01-autobuild.dpatch new file mode 100644 index 00000000000..25b00dd8c63 --- /dev/null +++ b/debian/patches/01-autobuild.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-autobuild.dpatch by Daniel Baumann +## +## DP: Disable modules check to make it buildable without X11. + +@DPATCH@ + +diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py +--- openerp-server.orig/setup.py 2008-11-03 21:33:56.000000000 +0000 ++++ openerp-server/setup.py 2008-11-09 09:00:02.000000000 +0000 +@@ -133,7 +133,7 @@ def data_files(): + files.append(('.', [('bin/import_xml.rng')])) + return files + +-check_modules() ++#check_modules() + + # create startup script + start_script = \ diff --git a/debian/patches/02-openerp.dpatch b/debian/patches/02-openerp.dpatch new file mode 100644 index 00000000000..8ea3504b815 --- /dev/null +++ b/debian/patches/02-openerp.dpatch @@ -0,0 +1,815 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-openerp.dpatch by Daniel Baumann +## +## DP: Update homepage location. + +@DPATCH@ + +diff -Naurp openerp-server.orig/bin/addons/account/__terp__.py openerp-server/bin/addons/account/__terp__.py +--- openerp-server.orig/bin/addons/account/__terp__.py 2008-11-03 21:34:08.000000000 +0000 ++++ openerp-server/bin/addons/account/__terp__.py 2008-11-09 09:04:09.000000000 +0000 +@@ -31,7 +31,7 @@ + Taxes management + Budgets + """, +- "website" : "http://tinyerp.com/module_account.html", ++ "website" : "http://openerp.com/module_account.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [ + ], +diff -Naurp openerp-server.orig/bin/addons/account_analytic_default/__terp__.py openerp-server/bin/addons/account_analytic_default/__terp__.py +--- openerp-server.orig/bin/addons/account_analytic_default/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_analytic_default/__terp__.py 2008-11-09 09:03:55.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Account Analytic Default", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/product_analytic_default", + "description": """ + Allows to automatically select analytic accounts based on criterions: +diff -Naurp openerp-server.orig/bin/addons/account_analytic_plans/__terp__.py openerp-server/bin/addons/account_analytic_plans/__terp__.py +--- openerp-server.orig/bin/addons/account_analytic_plans/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_analytic_plans/__terp__.py 2008-11-09 09:05:13.000000000 +0000 +@@ -52,7 +52,7 @@ Plan2: + So when this line of invoice will be confirmed, it will generate 3 analytic lines, + for one account entry. + """, +- "website" : "http://tinyerp.com/module_account.html", ++ "website" : "http://openerp.com/module_account.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [ + ], +diff -Naurp openerp-server.orig/bin/addons/account_balance/__terp__.py openerp-server/bin/addons/account_balance/__terp__.py +--- openerp-server.orig/bin/addons/account_balance/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_balance/__terp__.py 2008-11-09 09:03:39.000000000 +0000 +@@ -38,7 +38,7 @@ + + 5. You have an option to print the desired report in Landscape format. + """, +- "website" : "http://tinyerp.com/account_balance.html", ++ "website" : "http://openerp.com/account_balance.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [ + ], +diff -Naurp openerp-server.orig/bin/addons/account_budget/__terp__.py openerp-server/bin/addons/account_budget/__terp__.py +--- openerp-server.orig/bin/addons/account_budget/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_budget/__terp__.py 2008-11-09 09:05:05.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Budget Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_crossovered_budget.html", ++ "website" : "http://openerp.com/module_crossovered_budget.html", + "category" : "Generic Modules/Accounting", + "description": """This module allow accountants to manage analytic and crossovered budgets. + +diff -Naurp openerp-server.orig/bin/addons/account_chart/__terp__.py openerp-server/bin/addons/account_chart/__terp__.py +--- openerp-server.orig/bin/addons/account_chart/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_chart/__terp__.py 2008-11-09 09:03:15.000000000 +0000 +@@ -25,7 +25,7 @@ + "depends" : ["account"], + "author" : "Tiny", + "description": """Remove minimal account chart""", +- "website" : "http://tinyerp.com/module_account.html", ++ "website" : "http://openerp.com/module_account.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [ + ], +diff -Naurp openerp-server.orig/bin/addons/account_date_check/__terp__.py openerp-server/bin/addons/account_date_check/__terp__.py +--- openerp-server.orig/bin/addons/account_date_check/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_date_check/__terp__.py 2008-11-09 09:05:01.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Account Date check", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["account"], + "category" : "Generic Modules/Accounting", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/account_followup/__terp__.py openerp-server/bin/addons/account_followup/__terp__.py +--- openerp-server.orig/bin/addons/account_followup/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_followup/__terp__.py 2008-11-09 09:03:29.000000000 +0000 +@@ -37,7 +37,7 @@ + It will generate a PDF with all the letters according the the + different levels of recall defined. You can define different policies + for different companies.""", +- "website" : "http://tinyerp.com/module_account.html", ++ "website" : "http://openerp.com/module_account.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [], + "demo_xml" : ["followup_demo.xml"], +diff -Naurp openerp-server.orig/bin/addons/account_invoice_layout/__terp__.py openerp-server/bin/addons/account_invoice_layout/__terp__.py +--- openerp-server.orig/bin/addons/account_invoice_layout/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_invoice_layout/__terp__.py 2008-11-09 09:03:05.000000000 +0000 +@@ -35,7 +35,7 @@ + Moreover, there is one option which allow you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions... + + """, +- "website" : "http://tinyerp.com/", ++ "website" : "http://openerp.com/", + "category" : "Generic Modules/Project & Services", + "init_xml" : [], + "demo_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/account_report/__terp__.py openerp-server/bin/addons/account_report/__terp__.py +--- openerp-server.orig/bin/addons/account_report/__terp__.py 2008-11-03 21:34:12.000000000 +0000 ++++ openerp-server/bin/addons/account_report/__terp__.py 2008-11-09 09:04:21.000000000 +0000 +@@ -25,7 +25,7 @@ + "depends" : ["account"], + "author" : "Tiny", + "description": """Financial and accounting reporting""", +- "website" : "http://tinyerp.com/module_account.html", ++ "website" : "http://openerp.com/module_account.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [ ], + "demo_xml" : [ ], +diff -Naurp openerp-server.orig/bin/addons/account_tax_include/__terp__.py openerp-server/bin/addons/account_tax_include/__terp__.py +--- openerp-server.orig/bin/addons/account_tax_include/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/account_tax_include/__terp__.py 2008-11-09 09:05:16.000000000 +0000 +@@ -29,7 +29,7 @@ Especially useful for b2c businesses. + + This module implement the modification on the invoice form. + """, +- "website" : "http://tinyerp.com/module_account.html", ++ "website" : "http://openerp.com/module_account.html", + "category" : "Generic Modules/Accounting", + "init_xml" : [ ], + "demo_xml" : [ ], +diff -Naurp openerp-server.orig/bin/addons/account_voucher/__terp__.py openerp-server/bin/addons/account_voucher/__terp__.py +--- openerp-server.orig/bin/addons/account_voucher/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/account_voucher/__terp__.py 2008-11-09 09:04:17.000000000 +0000 +@@ -35,7 +35,7 @@ + * Accounting Periods + """, + "category" : "Generic Modules/Accounting", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["base", "account"], + "init_xml" : [ + ], +@@ -51,4 +51,4 @@ + ], + "active": False, + "installable": True +-} +\ No newline at end of file ++} +diff -Naurp openerp-server.orig/bin/addons/analytic_journal_billing_rate/__terp__.py openerp-server/bin/addons/analytic_journal_billing_rate/__terp__.py +--- openerp-server.orig/bin/addons/analytic_journal_billing_rate/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/analytic_journal_billing_rate/__terp__.py 2008-11-09 09:04:33.000000000 +0000 +@@ -31,7 +31,7 @@ + Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations. + + """, +- "website" : "http://tinyerp.com/", ++ "website" : "http://openerp.com/", + "category" : "Generic Modules/Others", + "init_xml" : [], + "demo_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/analytic_user_function/__terp__.py openerp-server/bin/addons/analytic_user_function/__terp__.py +--- openerp-server.orig/bin/addons/analytic_user_function/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/analytic_user_function/__terp__.py 2008-11-09 09:05:11.000000000 +0000 +@@ -31,7 +31,7 @@ + Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. + + """, +- "website" : "http://tinyerp.com/", ++ "website" : "http://openerp.com/", + "category" : "Generic Modules/Others", + "init_xml" : [], + "demo_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/auction/fr_FR.csv openerp-server/bin/addons/auction/fr_FR.csv +--- openerp-server.orig/bin/addons/auction/fr_FR.csv 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/auction/fr_FR.csv 2008-11-09 09:03:50.000000000 +0000 +@@ -4281,7 +4281,7 @@ wizard_field,"base_module_publish.module + wizard_view,"base_module_publish.module_publish,step2",0,Module publication,Publication du module + wizard_view,"base_module_publish.module_publish,step2",0,User information,Information utilisateur + wizard_view,"base_module_publish.module_publish,step2",0,Please provide here your login on the Tiny ERP website.,Tapez votre login du site Tinyerp SVP +-wizard_view,"base_module_publish.module_publish,step2",0,"If you don't have an access, you can create one http://www.tinyerp.com/","Si vous n'avez pas d'accès, vous pouvez en créer un sur http;//tinyerp.com" ++wizard_view,"base_module_publish.module_publish,step2",0,"If you don't have an access, you can create one http://www.openerp.com/","Si vous n'avez pas d'accès, vous pouvez en créer un sur http;//openerp.com" + wizard_button,"base_module_publish.module_publish,step2,end",0,Cancel,Annuler + wizard_button,"base_module_publish.module_publish,step2,step1",0,Previous,Précédent + wizard_button,"base_module_publish.module_publish,step2,publish",0,Publish,publier +@@ -5119,7 +5119,7 @@ wizard_field,"base_module_publish.module + wizard_view,"base_module_publish.module_publish_all,login",0,Module publication,Publication du module + wizard_view,"base_module_publish.module_publish_all,login",0,User information,Information utilisateur + wizard_view,"base_module_publish.module_publish_all,login",0,Please provide here your login on the Tiny ERP website., +-wizard_view,"base_module_publish.module_publish_all,login",0,"If you don't have an access, you can create one http://www.tinyerp.com/", ++wizard_view,"base_module_publish.module_publish_all,login",0,"If you don't have an access, you can create one http://www.openerp.com/", + wizard_button,"base_module_publish.module_publish_all,login,end",0,Cancel, + wizard_button,"base_module_publish.module_publish_all,login,publish",0,Publish, + wizard_field,"base_module_publish.module_publish_all,publish,already",0,Modules already updated, +diff -Naurp openerp-server.orig/bin/addons/audittrail/__terp__.py openerp-server/bin/addons/audittrail/__terp__.py +--- openerp-server.orig/bin/addons/audittrail/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/audittrail/__terp__.py 2008-11-09 09:02:57.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Audit Trail", + "version" : "1.0", + "depends" : ["base","account","purchase","mrp"], +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "author" : "Tiny", + "init_xml" : [], + "description": "Allows the administrator to track every user operations on all objects of the system.", +diff -Naurp openerp-server.orig/bin/addons/base_contact/__terp__.py openerp-server/bin/addons/base_contact/__terp__.py +--- openerp-server.orig/bin/addons/base_contact/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_contact/__terp__.py 2008-11-09 09:03:45.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Base Contact", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/Base Contact", + "description": """ + This module allows you to manage entirely your contacts. +diff -Naurp openerp-server.orig/bin/addons/base_module_publish/__terp__.py openerp-server/bin/addons/base_module_publish/__terp__.py +--- openerp-server.orig/bin/addons/base_module_publish/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_module_publish/__terp__.py 2008-11-09 09:03:13.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Module publisher", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/Base", + "description": """ + This module can be used by developpers to automatically publish their modules +diff -Naurp openerp-server.orig/bin/addons/base_module_record/__terp__.py openerp-server/bin/addons/base_module_record/__terp__.py +--- openerp-server.orig/bin/addons/base_module_record/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_module_record/__terp__.py 2008-11-09 09:04:02.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Module Recorder", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/Base", + "description": """ + This module allows you to create a new module without any development. +diff -Naurp openerp-server.orig/bin/addons/base_module_record/wizard/base_module_save.py openerp-server/bin/addons/base_module_record/wizard/base_module_save.py +--- openerp-server.orig/bin/addons/base_module_record/wizard/base_module_save.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_module_record/wizard/base_module_save.py 2008-11-09 09:04:00.000000000 +0000 +@@ -58,7 +58,7 @@ intro_start_fields = { + 'version': {'string':'Version', 'type':'char', 'size':16, 'required':True}, + 'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'Tiny', 'required':True}, + 'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True}, +- 'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://tinyerp.com', 'required':True}, ++ 'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://openerp.com', 'required':True}, + 'description': {'string':'Full Description', 'type':'text', 'required':True}, + 'data_kind': {'string':'Type of Data', 'type':'selection', 'selection':[('demo','Demo Data'),('update','Normal Data')], 'required':True, 'default': lambda *args:'update'}, + } +diff -Naurp openerp-server.orig/bin/addons/base_report_designer/__terp__.py openerp-server/bin/addons/base_report_designer/__terp__.py +--- openerp-server.orig/bin/addons/base_report_designer/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_report_designer/__terp__.py 2008-11-09 09:04:42.000000000 +0000 +@@ -28,7 +28,7 @@ OpenOffice. + "version" : "0.1", + "depends" : ["base"], + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/Base", + "init_xml" : [ ], + "demo_xml" : [ ], +diff -Naurp openerp-server.orig/bin/addons/base_report_designer/wizard/base_report_designer_modify.py openerp-server/bin/addons/base_report_designer/wizard/base_report_designer_modify.py +--- openerp-server.orig/bin/addons/base_report_designer/wizard/base_report_designer_modify.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_report_designer/wizard/base_report_designer_modify.py 2008-11-09 09:04:39.000000000 +0000 +@@ -41,7 +41,7 @@ intro_fields = { + 'readonly': True, + 'default': lambda *args: """This system must be used with the Tiny OpenOffice plugin. If you + did not installed yet, you can find this package on: +- http://tinyerp.com ++ http://openerp.com + + This wizard will provide you the .SXW report that you can modify + in OpenOffice. After having modified it, you will be able to reupload +diff -Naurp openerp-server.orig/bin/addons/base_setup/__terp__.py openerp-server/bin/addons/base_setup/__terp__.py +--- openerp-server.orig/bin/addons/base_setup/__terp__.py 2008-11-03 21:34:13.000000000 +0000 ++++ openerp-server/bin/addons/base_setup/__terp__.py 2008-11-09 09:04:37.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Base Setup", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/Base", + "description": """ + This module implements a configuration system that helps user +diff -Naurp openerp-server.orig/bin/addons/crm/__terp__.py openerp-server/bin/addons/crm/__terp__.py +--- openerp-server.orig/bin/addons/crm/__terp__.py 2008-11-03 21:34:14.000000000 +0000 ++++ openerp-server/bin/addons/crm/__terp__.py 2008-11-09 09:03:02.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Customer & Supplier Relationship Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_crm.html", ++ "website" : "http://openerp.com/module_crm.html", + "category" : "Generic Modules/CRM & SRM", + "description": """The Tiny ERP case and request tracker enables a group of + people to intelligently and efficiently manage tasks, issues, and requests. +diff -Naurp openerp-server.orig/bin/addons/crm_configuration/__terp__.py openerp-server/bin/addons/crm_configuration/__terp__.py +--- openerp-server.orig/bin/addons/crm_configuration/__terp__.py 2008-11-03 21:34:14.000000000 +0000 ++++ openerp-server/bin/addons/crm_configuration/__terp__.py 2008-11-09 09:04:04.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Customer Relationship Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_crm.html", ++ "website" : "http://openerp.com/module_crm.html", + "category" : "Generic Modules/CRM & SRM", + "description": """ + The Tiny ERP case and request tracker enables a group of +diff -Naurp openerp-server.orig/bin/addons/crm_profiling/__terp__.py openerp-server/bin/addons/crm_profiling/__terp__.py +--- openerp-server.orig/bin/addons/crm_profiling/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/crm_profiling/__terp__.py 2008-11-09 09:04:07.000000000 +0000 +@@ -36,7 +36,7 @@ + + * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed. + """, +- "website" : "http://tinyerp.com/", ++ "website" : "http://openerp.com/", + "category" : "Generic Modules/Project & Services", + "init_xml" : [], + "demo_xml" : ["crm_profiling_demo.xml"], +diff -Naurp openerp-server.orig/bin/addons/crm_vertical/__terp__.py openerp-server/bin/addons/crm_vertical/__terp__.py +--- openerp-server.orig/bin/addons/crm_vertical/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/crm_vertical/__terp__.py 2008-11-09 09:03:53.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "CRM Verticalisation", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Vertical Modules/Parametrization", + "description": """Simplification of the interface for CRM.""", + "depends" : ["crm_configuration"], +diff -Naurp openerp-server.orig/bin/addons/custom/__terp__.py openerp-server/bin/addons/custom/__terp__.py +--- openerp-server.orig/bin/addons/custom/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/custom/__terp__.py 2008-11-09 09:06:23.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Others", +- "website": "http://www.tinyerp.com", ++ "website": "http://www.openerp.com", + "description": "Sample custom module where you can put your customer specific developments.", + "depends" : ["base"], + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/delivery/delivery_demo.xml openerp-server/bin/addons/delivery/delivery_demo.xml +--- openerp-server.orig/bin/addons/delivery/delivery_demo.xml 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/delivery/delivery_demo.xml 2008-11-09 09:03:34.000000000 +0000 +@@ -5,7 +5,7 @@ + + + The Poste +- http://tinyerp.com ++ http://openerp.com + + + Fabien Pinckaers +diff -Naurp openerp-server.orig/bin/addons/document/__terp__.py openerp-server/bin/addons/document/__terp__.py +--- openerp-server.orig/bin/addons/document/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/document/__terp__.py 2008-11-09 09:05:41.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Others", +- "website": "http://www.tinyerp.com", ++ "website": "http://www.openerp.com", + "description": """This is a complete document management system: + * FTP Interface + * User Authentification +diff -Naurp openerp-server.orig/bin/addons/document_ics/__terp__.py openerp-server/bin/addons/document_ics/__terp__.py +--- openerp-server.orig/bin/addons/document_ics/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/document_ics/__terp__.py 2008-11-09 09:06:18.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Others", +- "website": "http://www.tinyerp.com", ++ "website": "http://www.openerp.com", + "description": """Allows to synchronize calendars with others applications.""", + "depends" : ["document","crm_configuration"], + "init_xml" : ["document_data.xml"], +diff -Naurp openerp-server.orig/bin/addons/google_map/__terp__.py openerp-server/bin/addons/google_map/__terp__.py +--- openerp-server.orig/bin/addons/google_map/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/google_map/__terp__.py 2008-11-09 09:04:31.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Google Map", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules", + "description": """The module adds google map field in partner address + so that we can directly open google map from the +diff -Naurp openerp-server.orig/bin/addons/hr/__terp__.py openerp-server/bin/addons/hr/__terp__.py +--- openerp-server.orig/bin/addons/hr/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/hr/__terp__.py 2008-11-09 09:04:28.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", +- "website" : "http://tinyerp.com/module_hr.html", ++ "website" : "http://openerp.com/module_hr.html", + "description": """ + Module for human resource management. You can manage: + * Employees and hierarchies +diff -Naurp openerp-server.orig/bin/addons/hr_contract/__terp__.py openerp-server/bin/addons/hr_contract/__terp__.py +--- openerp-server.orig/bin/addons/hr_contract/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/hr_contract/__terp__.py 2008-11-09 09:03:00.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", +- "website" : "http://tinyerp.com/module_hr.html", ++ "website" : "http://openerp.com/module_hr.html", + "depends" : ["hr"], + "module": "", + "description": """ +diff -Naurp openerp-server.orig/bin/addons/hr_expense/__terp__.py openerp-server/bin/addons/hr_expense/__terp__.py +--- openerp-server.orig/bin/addons/hr_expense/__terp__.py 2008-11-03 21:34:15.000000000 +0000 ++++ openerp-server/bin/addons/hr_expense/__terp__.py 2008-11-09 09:04:49.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", +- "website" : "http://tinyerp.com/module_hr.html", ++ "website" : "http://openerp.com/module_hr.html", + "depends" : ["hr","account", "account_tax_include",], + "description": """ + This module aims to manage employee's expenses. +diff -Naurp openerp-server.orig/bin/addons/hr_holidays/__terp__.py openerp-server/bin/addons/hr_holidays/__terp__.py +--- openerp-server.orig/bin/addons/hr_holidays/__terp__.py 2008-11-03 21:34:16.000000000 +0000 ++++ openerp-server/bin/addons/hr_holidays/__terp__.py 2008-11-09 09:03:21.000000000 +0000 +@@ -4,7 +4,7 @@ + "version" : "0.1", + "author" : "Tiny & Axelor", + "category" : "Generic Modules/Human Resources", +- "website" : "http://tinyerp.com/", ++ "website" : "http://openerp.com/", + "description": """Human Ressources: Holidays tracking and workflow + + This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status. +diff -Naurp openerp-server.orig/bin/addons/hr_timesheet/__terp__.py openerp-server/bin/addons/hr_timesheet/__terp__.py +--- openerp-server.orig/bin/addons/hr_timesheet/__terp__.py 2008-11-03 21:34:16.000000000 +0000 ++++ openerp-server/bin/addons/hr_timesheet/__terp__.py 2008-11-09 09:04:11.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", +- "website" : "http://tinyerp.com/module_hr.html", ++ "website" : "http://openerp.com/module_hr.html", + "description": """ + This module implement a timesheet system. Each employee can encode and + track their time spent on the different projects. A project is an +diff -Naurp openerp-server.orig/bin/addons/hr_timesheet_invoice/__terp__.py openerp-server/bin/addons/hr_timesheet_invoice/__terp__.py +--- openerp-server.orig/bin/addons/hr_timesheet_invoice/__terp__.py 2008-11-03 21:34:16.000000000 +0000 ++++ openerp-server/bin/addons/hr_timesheet_invoice/__terp__.py 2008-11-09 09:05:06.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Accounting", +- "website" : "http://tinyerp.com/", ++ "website" : "http://openerp.com/", + "depends" : ["account",'hr_timesheet'], + "description": """ + Module to generate invoices based on costs (human ressources, expenses, ...). +diff -Naurp openerp-server.orig/bin/addons/hr_timesheet_project/__terp__.py openerp-server/bin/addons/hr_timesheet_project/__terp__.py +--- openerp-server.orig/bin/addons/hr_timesheet_project/__terp__.py 2008-11-03 21:34:16.000000000 +0000 ++++ openerp-server/bin/addons/hr_timesheet_project/__terp__.py 2008-11-09 09:02:58.000000000 +0000 +@@ -25,7 +25,7 @@ + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", + "description": """Auto-complete timesheet based on tasks made on the project management module.""", +- "website" : "http://tinyerp.com/module_hr.html", ++ "website" : "http://openerp.com/module_hr.html", + "depends" : ["project", "hr_timesheet_sheet"], + "update_xml" : ["hr_timesheet_project_view.xml", + "process/hr_timesheet_project_process.xml", +diff -Naurp openerp-server.orig/bin/addons/hr_timesheet_sheet/__terp__.py openerp-server/bin/addons/hr_timesheet_sheet/__terp__.py +--- openerp-server.orig/bin/addons/hr_timesheet_sheet/__terp__.py 2008-11-03 21:34:16.000000000 +0000 ++++ openerp-server/bin/addons/hr_timesheet_sheet/__terp__.py 2008-11-09 09:03:11.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Human Resources", +- "website" : "http://tinyerp.com/module_hr.html", ++ "website" : "http://openerp.com/module_hr.html", + "description": """ + This module help you easily encode and validate timesheet and attendances + within the same view. The upper part of the view is for attendances and +diff -Naurp openerp-server.orig/bin/addons/mrp/__terp__.py openerp-server/bin/addons/mrp/__terp__.py +--- openerp-server.orig/bin/addons/mrp/__terp__.py 2008-11-03 21:34:17.000000000 +0000 ++++ openerp-server/bin/addons/mrp/__terp__.py 2008-11-09 09:05:08.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Manufacturing Resource Planning", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_mrp.html", ++ "website" : "http://openerp.com/module_mrp.html", + "category" : "Generic Modules/Production", + "depends" : ["stock", "hr", "purchase", "product", "process"], + "description": """ +diff -Naurp openerp-server.orig/bin/addons/mrp_operations/__terp__.py openerp-server/bin/addons/mrp_operations/__terp__.py +--- openerp-server.orig/bin/addons/mrp_operations/__terp__.py 2008-11-03 21:34:17.000000000 +0000 ++++ openerp-server/bin/addons/mrp_operations/__terp__.py 2008-11-09 09:03:14.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Workcenter Production start end workflow", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_mrp.html", ++ "website" : "http://openerp.com/module_mrp.html", + "category" : "Generic Modules/Production", + "depends" : ["stock", "hr", "purchase", "product", "mrp"], + "description": """ +diff -Naurp openerp-server.orig/bin/addons/mrp_subproduct/__terp__.py openerp-server/bin/addons/mrp_subproduct/__terp__.py +--- openerp-server.orig/bin/addons/mrp_subproduct/__terp__.py 2008-11-03 21:34:17.000000000 +0000 ++++ openerp-server/bin/addons/mrp_subproduct/__terp__.py 2008-11-09 09:03:57.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "MRP Sub Product", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_stock.html", ++ "website" : "http://openerp.com/module_stock.html", + "depends" : ["base","mrp"], + "category" : "Generic Modules/Production", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/process/__terp__.py openerp-server/bin/addons/process/__terp__.py +--- openerp-server.orig/bin/addons/process/__terp__.py 2008-11-03 21:34:17.000000000 +0000 ++++ openerp-server/bin/addons/process/__terp__.py 2008-11-09 09:04:25.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Enterprise Process", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/Base", + "description": """ + This module allows you to manage your process for the end-users. +diff -Naurp openerp-server.orig/bin/addons/project/__terp__.py openerp-server/bin/addons/project/__terp__.py +--- openerp-server.orig/bin/addons/project/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/project/__terp__.py 2008-11-09 09:03:43.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Project Management", + "version": "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_project.html", ++ "website" : "http://openerp.com/module_project.html", + "category" : "Generic Modules/Projects & Services", + "depends" : ["product", "account", "hr", "process"], + "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.", +diff -Naurp openerp-server.orig/bin/addons/project_mrp/__terp__.py openerp-server/bin/addons/project_mrp/__terp__.py +--- openerp-server.orig/bin/addons/project_mrp/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/project_mrp/__terp__.py 2008-11-09 09:02:54.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Project Management - MRP Link", + "version": "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_project.html", ++ "website" : "http://openerp.com/module_project.html", + "category" : "Generic Modules/Projects & Services", + "depends" : ["project", 'mrp', "sale"], + "description": """ +diff -Naurp openerp-server.orig/bin/addons/project_timesheet/__terp__.py openerp-server/bin/addons/project_timesheet/__terp__.py +--- openerp-server.orig/bin/addons/project_timesheet/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/project_timesheet/__terp__.py 2008-11-09 09:04:13.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Project Timesheet", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "category" : "Generic Modules/HR", + "description": """ + This module lets you transfer the entries under tasks defined for Project Management to +diff -Naurp openerp-server.orig/bin/addons/purchase/__terp__.py openerp-server/bin/addons/purchase/__terp__.py +--- openerp-server.orig/bin/addons/purchase/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/purchase/__terp__.py 2008-11-09 09:03:07.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Purchase Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_purchase.html", ++ "website" : "http://openerp.com/module_purchase.html", + "depends" : ["base", "account", "stock", "process"], + "category" : "Generic Modules/Sales & Purchases", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/purchase_analytic_plans/__terp__.py openerp-server/bin/addons/purchase_analytic_plans/__terp__.py +--- openerp-server.orig/bin/addons/purchase_analytic_plans/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/purchase_analytic_plans/__terp__.py 2008-11-09 09:03:17.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Purchase Analytic Distribution Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["purchase","account_analytic_plans"], + "category" : "Generic Modules/Sales & Purchases", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/report_account/__terp__.py openerp-server/bin/addons/report_account/__terp__.py +--- openerp-server.orig/bin/addons/report_account/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/report_account/__terp__.py 2008-11-09 09:04:30.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Account Reporting - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["account"], + "category" : "Generic Modules/Accounting", + "description": "A module that adds new reports based on the account module.", +diff -Naurp openerp-server.orig/bin/addons/report_analytic/__terp__.py openerp-server/bin/addons/report_analytic/__terp__.py +--- openerp-server.orig/bin/addons/report_analytic/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/report_analytic/__terp__.py 2008-11-09 09:04:19.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Analytic Account Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["account","hr_timesheet_invoice"], + "category" : "Generic Modules/Accounting", + "description": "A module that adds new reports based on analytic accounts.", +diff -Naurp openerp-server.orig/bin/addons/report_analytic_line/__terp__.py openerp-server/bin/addons/report_analytic_line/__terp__.py +--- openerp-server.orig/bin/addons/report_analytic_line/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/report_analytic_line/__terp__.py 2008-11-09 09:04:45.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Analytic lines - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["account", "hr_timesheet_invoice"], + "category" : "Generic Modules/Accounting", + "description": "A report on analytic lines, costs by products, months and accounts.", +diff -Naurp openerp-server.orig/bin/addons/report_analytic_planning/__terp__.py openerp-server/bin/addons/report_analytic_planning/__terp__.py +--- openerp-server.orig/bin/addons/report_analytic_planning/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/report_analytic_planning/__terp__.py 2008-11-09 09:05:03.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Analytic planning - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["account", "hr_timesheet_invoice","project","report_analytic_line"], + "category" : "Generic Modules/Accounting", + "description": "Planning on analytic accounts.", +diff -Naurp openerp-server.orig/bin/addons/report_crm/__terp__.py openerp-server/bin/addons/report_crm/__terp__.py +--- openerp-server.orig/bin/addons/report_crm/__terp__.py 2008-11-03 21:34:18.000000000 +0000 ++++ openerp-server/bin/addons/report_crm/__terp__.py 2008-11-09 09:03:41.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "CRM Management - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_crm.html", ++ "website" : "http://openerp.com/module_crm.html", + "depends" : ["crm"], + "category" : "Generic Modules/CRM & SRM", + "description": "A module that adds new reports based on CRM cases.", +diff -Naurp openerp-server.orig/bin/addons/report_intrastat/__terp__.py openerp-server/bin/addons/report_intrastat/__terp__.py +--- openerp-server.orig/bin/addons/report_intrastat/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/report_intrastat/__terp__.py 2008-11-09 09:03:10.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Intrastat Reporting - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["base", "product", "stock", "sale", "purchase"], + "category" : "Generic Modules/Inventory Control", + "description": "A module that adds intrastat reports.", +diff -Naurp openerp-server.orig/bin/addons/report_mrp/__terp__.py openerp-server/bin/addons/report_mrp/__terp__.py +--- openerp-server.orig/bin/addons/report_mrp/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/report_mrp/__terp__.py 2008-11-09 09:04:23.000000000 +0000 +@@ -23,7 +23,7 @@ + "name": "MRP Management - Reporting", + "version": "1.0", + "author": "Tiny", +- "website": "http://tinyerp.com/module_mrp.html", ++ "website": "http://openerp.com/module_mrp.html", + "depends": ["mrp"], + "category": "Generic Modules/Production", + "description": "A module that adds new reports based on MRP cases.", +diff -Naurp openerp-server.orig/bin/addons/report_project/__terp__.py openerp-server/bin/addons/report_project/__terp__.py +--- openerp-server.orig/bin/addons/report_project/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/report_project/__terp__.py 2008-11-09 09:03:37.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Sales Management - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_project.html", ++ "website" : "http://openerp.com/module_project.html", + "depends" : ["project", "report_task"], + "category" : "Generic Modules/Sales & Purchases", + "description": "A module that adds some reports on the sales", +diff -Naurp openerp-server.orig/bin/addons/report_purchase/__terp__.py openerp-server/bin/addons/report_purchase/__terp__.py +--- openerp-server.orig/bin/addons/report_purchase/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/report_purchase/__terp__.py 2008-11-09 09:03:01.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Sales Management - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_purchase.html", ++ "website" : "http://openerp.com/module_purchase.html", + "depends" : ["purchase"], + "category" : "Generic Modules/Sales & Purchases", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/report_sale/__terp__.py openerp-server/bin/addons/report_sale/__terp__.py +--- openerp-server.orig/bin/addons/report_sale/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/report_sale/__terp__.py 2008-11-09 09:04:15.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Sales Management - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["sale"], + "category" : "Generic Modules/Sales & Purchases", + "description": """ +diff -Naurp openerp-server.orig/bin/addons/report_timesheet/__terp__.py openerp-server/bin/addons/report_timesheet/__terp__.py +--- openerp-server.orig/bin/addons/report_timesheet/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/report_timesheet/__terp__.py 2008-11-09 09:03:31.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Timesheet - Reporting", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com", ++ "website" : "http://openerp.com", + "depends" : ["hr_timesheet",'hr_timesheet_invoice'], + "category" : "Generic Modules/Human Ressources", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/sale/__terp__.py openerp-server/bin/addons/sale/__terp__.py +--- openerp-server.orig/bin/addons/sale/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/sale/__terp__.py 2008-11-09 09:04:47.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Sales Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["product", "stock", "mrp", "process"], + "category" : "Generic Modules/Sales & Purchases", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/sale_analytic_plans/__terp__.py openerp-server/bin/addons/sale_analytic_plans/__terp__.py +--- openerp-server.orig/bin/addons/sale_analytic_plans/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/sale_analytic_plans/__terp__.py 2008-11-09 09:04:44.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Sales Analytic Distribution Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["sale","account_analytic_plans"], + "category" : "Generic Modules/Sales & Purchases", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/sale_crm/__terp__.py openerp-server/bin/addons/sale_crm/__terp__.py +--- openerp-server.orig/bin/addons/sale_crm/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/sale_crm/__terp__.py 2008-11-09 09:04:27.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Sale CRM Stuff", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["sale", "crm_configuration"], + "category" : "Generic Modules/Sales & Purchases", + "description": """ +diff -Naurp openerp-server.orig/bin/addons/sale_journal/__terp__.py openerp-server/bin/addons/sale_journal/__terp__.py +--- openerp-server.orig/bin/addons/sale_journal/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/sale_journal/__terp__.py 2008-11-09 09:06:20.000000000 +0000 +@@ -24,7 +24,7 @@ + "version" : "1.0", + "author" : "Tiny", + "category" : "Generic Modules/Sales & Purchases", +- "website": "http://www.tinyerp.com", ++ "website": "http://www.openerp.com", + "depends" : ["stock","sale"], + "demo_xml" : ['sale_journal_demo.xml'], + "init_xml" : ['sale_journal_data.xml'], +diff -Naurp openerp-server.orig/bin/addons/stock/__terp__.py openerp-server/bin/addons/stock/__terp__.py +--- openerp-server.orig/bin/addons/stock/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/stock/__terp__.py 2008-11-09 09:03:08.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Stock Management", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_stock.html", ++ "website" : "http://openerp.com/module_stock.html", + "depends" : ["product", "account"], + "category" : "Generic Modules/Inventory Control", + "init_xml" : [], +diff -Naurp openerp-server.orig/bin/addons/stock_invoice_directly/__terp__.py openerp-server/bin/addons/stock_invoice_directly/__terp__.py +--- openerp-server.orig/bin/addons/stock_invoice_directly/__terp__.py 2008-11-03 21:34:19.000000000 +0000 ++++ openerp-server/bin/addons/stock_invoice_directly/__terp__.py 2008-11-09 09:05:09.000000000 +0000 +@@ -23,7 +23,7 @@ + "name" : "Invoice Picking Directly", + "version" : "1.0", + "author" : "Tiny", +- "website" : "http://tinyerp.com/module_sale.html", ++ "website" : "http://openerp.com/module_sale.html", + "depends" : ["delivery"], + "category" : "Generic Modules/Sales & Purchases", + "description": """ diff --git a/debian/patches/03-migrate.dpatch b/debian/patches/03-migrate.dpatch new file mode 100644 index 00000000000..3bde7b143eb --- /dev/null +++ b/debian/patches/03-migrate.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-migrate.dpatch by Brian DeRocher +## +## DP: Correct SQL syntax in migrate script (Closes: #467517). + +@DPATCH@ + +diff -Naurp openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py openerp-server/doc/migrate/3.4.0-4.0.0/pre.py +--- openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-03 21:33:56.000000000 +0000 ++++ openerp-server/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-09 09:09:49.000000000 +0000 +@@ -123,7 +123,7 @@ cr.commit() + + for line in ( + "ALTER TABLE ir_module_module ADD demo BOOLEAN", +- "ALTER TABLE ir_module_module SET demo DEFAULT False", ++ "ALTER TABLE ir_module_module alter column demo set DEFAULT False", + "DELETE FROM ir_values WHERE VALUE LIKE '%,False'", + """UPDATE ir_ui_view set arch='' where name='ir.ui.menu.tree' and type='tree' and field_parent='child_id'""", + ): diff --git a/debian/patches/04-shebang.dpatch b/debian/patches/04-shebang.dpatch new file mode 100644 index 00000000000..748d2aef330 --- /dev/null +++ b/debian/patches/04-shebang.dpatch @@ -0,0 +1,25 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 04-shebang.dpatch by Daniel Baumann +## +## DP: Correct shebank. + +@DPATCH@ + +diff -Naurp openerp-server.orig/bin/addons/auction/barcode/test.py openerp-server/bin/addons/auction/barcode/test.py +--- openerp-server.orig/bin/addons/auction/barcode/test.py 2008-11-09 13:50:48.000000000 +0000 ++++ openerp-server/bin/addons/auction/barcode/test.py 2008-11-09 13:57:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/pkg/bin/python ++#!/usr/bin/python + from common import * + from code39 import * + from code93 import * +diff -Naurp openerp-server.orig/bin/addons/base/ir/workflow/pydot/dot_parser.py openerp-server/bin/addons/base/ir/workflow/pydot/dot_parser.py +--- openerp-server.orig/bin/addons/base/ir/workflow/pydot/dot_parser.py 2008-11-09 13:50:48.000000000 +0000 ++++ openerp-server/bin/addons/base/ir/workflow/pydot/dot_parser.py 2008-11-09 13:58:15.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/bin/env python ++#!/usr/bin/python + + """ + The dotparser parses graphviz files in dot and dot files and transforms them diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 00000000000..b64993e5f13 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,46 @@ +#!/bin/sh + +set -e + +USER="openerp" +CONFFILE="/etc/openerp-server.conf" +LOGFILE="/var/log/openerp.log" + +case "${1}" in + configure) + # Creating system user + adduser --no-create-home --quiet --system ${USER} + + # Creating log file + touch ${LOGFILE} + chown ${USER}:adm ${LOGFILE} + chmod 0640 ${LOGFILE} + + # Setting ownership + chown ${USER}:${USER} /usr/lib/openerp-server/addons -R + + chmod 0640 ${CONFFILE} + chown ${USER}:${USER} ${CONFFILE} + + echo + echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" + echo "* OpenERP 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/postrm b/debian/postrm new file mode 100644 index 00000000000..820cd0c3665 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +USER="openerp" + +case "${1}" in + purge) + # Removing system user + if [ -x /usr/sbin/deluser ] + then + deluser --quiet --system ${USER} + fi + ;; + + remove|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 new file mode 100755 index 00000000000..b06842e76bb --- /dev/null +++ b/debian/rules @@ -0,0 +1,62 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +clean: clean-patched unpatch +clean-patched: patch-stamp + dh_testdir + dh_testroot + rm -f build-stamp + + python setup.py clean + + rm -rf build openerp-server + -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f + + dh_clean + +build: patch-stamp + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + python setup.py install --no-compile --prefix=$(CURDIR)/debian/tinyerp-server/usr + + # Adjusting program location + sed -i -e 's|python.*/site-packages/||' debian/tinyerp-server/usr/bin/openerp-server + mv debian/tinyerp-server/usr/lib/python*/site-packages/openerp-server debian/tinyerp-server/usr/lib + rm -rf debian/tinyerp-server/usr/lib/python* + + # Workaround for bug in setup.py + mv debian/tinyerp-server/usr/import_xml.rng debian/tinyerp-server/usr/lib/openerp-server + + # Fixing permissions + find debian/tinyerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644 + + # Removing double files + rm -rf debian/tinyerp-server/usr/share/doc/openerp-server-* + +binary: binary-indep + +binary-arch: + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs doc/Changelog + dh_installdocs + dh_install + dh_installinit --name=openerp-server --update-rcd-params='defaults 21' + dh_lintian + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: clean build install binary binary-arch binary-indep From 0dc7a9be4a096ce82d6ab2137ee57190f9dbfbc4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:37 +0300 Subject: [PATCH 02/66] Renaming tinyerp-server to new upstream openerp-server name. bzr revid: p_christ@hol.gr-20090421090637-sexpu1qcy9yfn4h7 --- debian/control | 21 ++++++++++++++++----- debian/{openerp-server.init => init} | 0 debian/lintian-overrides | 2 +- debian/rules | 16 ++++++++-------- 4 files changed, 25 insertions(+), 14 deletions(-) rename debian/{openerp-server.init => init} (100%) diff --git a/debian/control b/debian/control index cb17a747d9f..21997877b8c 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: tinyerp-server +Source: openerp-server Section: net Priority: optional Maintainer: Daniel Baumann @@ -9,13 +9,14 @@ Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git Vcs-Git: git://git.debian.net/git/debian/openerp-server.git -Package: tinyerp-server +Package: openerp-server Section: net Architecture: all Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz +Conflicts: tinyerp-server (<< 5.0.0~alpha-2) +Replaces: tinyerp-server Recommends: graphviz, postgresql, postgresql-client, python-imaging, python-pyparsing -Provides: openerp-server -Suggests: tinyerp-client +Suggests: openerp-client Description: Enterprise Resource Management (server) OpenERP is a complete ERP and CRM. The main features are accounting (analytic and financial), stock management, sales and purchases management, tasks @@ -23,5 +24,15 @@ Description: Enterprise Resource Management (server) 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 OpenERP server, install tinyerp-client package for + This package contains the OpenERP server, install openerp-client package for the client. + +Package: tinyerp-server +Architecture: all +Depends: openerp-server +Description: Enterprise Resource Management (server; transitional package) + Package to ease upgrading from older tinyerp-server packages to the new + openerp-server package. + . + This package can be purged at anytime once the openerp-server package has been + installed. diff --git a/debian/openerp-server.init b/debian/init similarity index 100% rename from debian/openerp-server.init rename to debian/init diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 0586695f2e9..b99e0ccf133 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,3 +1,3 @@ # Add-on directories needs data directories, and sometimes they are # (intentionally) empty, hence overriting the lintian warning. -tinyerp-server: package-contains-empty-directory +openerp-server: package-contains-empty-directory diff --git a/debian/rules b/debian/rules index b06842e76bb..d56e2ad3c0d 100755 --- a/debian/rules +++ b/debian/rules @@ -23,21 +23,21 @@ install: build dh_prep dh_installdirs - python setup.py install --no-compile --prefix=$(CURDIR)/debian/tinyerp-server/usr + python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr # Adjusting program location - sed -i -e 's|python.*/site-packages/||' debian/tinyerp-server/usr/bin/openerp-server - mv debian/tinyerp-server/usr/lib/python*/site-packages/openerp-server debian/tinyerp-server/usr/lib - rm -rf debian/tinyerp-server/usr/lib/python* + sed -i -e 's|python.*/site-packages/||' debian/openerp-server/usr/bin/openerp-server + mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib + rm -rf debian/openerp-server/usr/lib/python* # Workaround for bug in setup.py - mv debian/tinyerp-server/usr/import_xml.rng debian/tinyerp-server/usr/lib/openerp-server + mv debian/openerp-server/usr/import_xml.rng debian/openerp-server/usr/lib/openerp-server # Fixing permissions - find debian/tinyerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644 + find debian/openerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644 # Removing double files - rm -rf debian/tinyerp-server/usr/share/doc/openerp-server-* + rm -rf debian/openerp-server/usr/share/doc/openerp-server-* binary: binary-indep @@ -49,7 +49,7 @@ binary-indep: build install dh_installchangelogs doc/Changelog dh_installdocs dh_install - dh_installinit --name=openerp-server --update-rcd-params='defaults 21' + dh_installinit --update-rcd-params='defaults 21' dh_lintian dh_link dh_compress From be398db32092aa7510e56ab234814a5842616df2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:37 +0300 Subject: [PATCH 03/66] Releasing debian version 5.0.0~alpha-2. bzr revid: p_christ@hol.gr-20090421090637-z2uoem880ggmca3a --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fdc15885f77..072531762fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.0~alpha-2) experimental; urgency=low + + * Renaming tinyerp-server to new upstream openerp-server name. + + -- Daniel Baumann Sun, 9 Nov 2008 18:59:00 +0100 + tinyerp-server (5.0.0~alpha-1) experimental; urgency=low * Merging upstream version 5.0.0~alpha. From 8d9ea729585834fdc365f74c5bc97d8d09213f18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:38 +0300 Subject: [PATCH 04/66] Adding ghostscript, python-matplotlib, and python-pyopenssl to recommends. bzr revid: p_christ@hol.gr-20090421090638-ajz7owitvdwn5289 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 21997877b8c..aa011008003 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Architecture: all Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz Conflicts: tinyerp-server (<< 5.0.0~alpha-2) Replaces: tinyerp-server -Recommends: graphviz, postgresql, postgresql-client, python-imaging, python-pyparsing +Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-pyopenssl, python-pyparsing Suggests: openerp-client Description: Enterprise Resource Management (server) OpenERP is a complete ERP and CRM. The main features are accounting (analytic From 616fcd2bb0062fd624de3339664bc870b751a498 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:38 +0300 Subject: [PATCH 05/66] Correcting chown calls in postinst. bzr revid: p_christ@hol.gr-20090421090638-7t52dkc02houflfm --- debian/postinst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/postinst b/debian/postinst index b64993e5f13..a7854521e5b 100644 --- a/debian/postinst +++ b/debian/postinst @@ -17,10 +17,10 @@ case "${1}" in chmod 0640 ${LOGFILE} # Setting ownership - chown ${USER}:${USER} /usr/lib/openerp-server/addons -R + chown ${USER} /usr/lib/openerp-server/addons -R chmod 0640 ${CONFFILE} - chown ${USER}:${USER} ${CONFFILE} + chown ${USER} ${CONFFILE} echo echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" From 9d52dcdb4a8f73d09870f0740923acc052b0e433 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:38 +0300 Subject: [PATCH 06/66] Prefixing debhelper files with package name. bzr revid: p_christ@hol.gr-20090421090638-0y3mq4p8u01jmlf9 --- debian/{README.Debian => openerp-server.README.Debian} | 0 debian/{docs => openerp-server.docs} | 0 debian/{init => openerp-server.init} | 0 debian/{install => openerp-server.install} | 0 debian/{links => openerp-server.links} | 0 debian/{lintian-overrides => openerp-server.lintian-overrides} | 0 debian/{postinst => openerp-server.postinst} | 0 debian/{postrm => openerp-server.postrm} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename debian/{README.Debian => openerp-server.README.Debian} (100%) rename debian/{docs => openerp-server.docs} (100%) rename debian/{init => openerp-server.init} (100%) rename debian/{install => openerp-server.install} (100%) rename debian/{links => openerp-server.links} (100%) rename debian/{lintian-overrides => openerp-server.lintian-overrides} (100%) rename debian/{postinst => openerp-server.postinst} (100%) rename debian/{postrm => openerp-server.postrm} (100%) diff --git a/debian/README.Debian b/debian/openerp-server.README.Debian similarity index 100% rename from debian/README.Debian rename to debian/openerp-server.README.Debian diff --git a/debian/docs b/debian/openerp-server.docs similarity index 100% rename from debian/docs rename to debian/openerp-server.docs diff --git a/debian/init b/debian/openerp-server.init similarity index 100% rename from debian/init rename to debian/openerp-server.init diff --git a/debian/install b/debian/openerp-server.install similarity index 100% rename from debian/install rename to debian/openerp-server.install diff --git a/debian/links b/debian/openerp-server.links similarity index 100% rename from debian/links rename to debian/openerp-server.links diff --git a/debian/lintian-overrides b/debian/openerp-server.lintian-overrides similarity index 100% rename from debian/lintian-overrides rename to debian/openerp-server.lintian-overrides diff --git a/debian/postinst b/debian/openerp-server.postinst similarity index 100% rename from debian/postinst rename to debian/openerp-server.postinst diff --git a/debian/postrm b/debian/openerp-server.postrm similarity index 100% rename from debian/postrm rename to debian/openerp-server.postrm From 2e236ab78385fe9618dc810052fc2982cb568255 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:38 +0300 Subject: [PATCH 07/66] Adding changelog for debian version 4.2.3.4-2. bzr revid: p_christ@hol.gr-20090421090638-c1y45zap8x6khfqm --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 072531762fb..bb84fb6ba2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,12 @@ tinyerp-server (5.0.0~alpha-1) experimental; urgency=low -- Daniel Baumann Sun, 9 Nov 2008 15:52:00 +0100 +tinyerp-server (4.2.3.4-2) unstable; urgency=low + + * Correcting chown calls in postinst. + + -- Daniel Baumann Mon, 10 Nov 2008 12:40:00 +0100 + tinyerp-server (4.2.3.4-1) unstable; urgency=low * Merging upstream version 4.2.3.4. From 07f7013afc913a3a28ccb2d4544c92ba6c5e256c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:38 +0300 Subject: [PATCH 08/66] Dropping tinyerp-server transitional package, this allows to have both packages available in unstable. bzr revid: p_christ@hol.gr-20090421090638-upxpbfgr6tk4bdit --- debian/control | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index aa011008003..d1266c94721 100644 --- a/debian/control +++ b/debian/control @@ -13,26 +13,17 @@ Package: openerp-server Section: net Architecture: all Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz -Conflicts: tinyerp-server (<< 5.0.0~alpha-2) +Conflicts: tinyerp-server Replaces: tinyerp-server Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-pyopenssl, python-pyparsing Suggests: openerp-client Description: Enterprise Resource Management (server) - OpenERP 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. + 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 OpenERP server, install openerp-client package for the client. - -Package: tinyerp-server -Architecture: all -Depends: openerp-server -Description: Enterprise Resource Management (server; transitional package) - Package to ease upgrading from older tinyerp-server packages to the new - openerp-server package. - . - This package can be purged at anytime once the openerp-server package has been - installed. From 86fa880f3012a98af8dc750892532becd28625bf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:39 +0300 Subject: [PATCH 09/66] Releasing debian version 5.0.0~alpha-3. bzr revid: p_christ@hol.gr-20090421090639-zrkkwqy3s1b87h2g --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index bb84fb6ba2e..03e522eccbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +openerp-server (5.0.0~alpha-3) unstable; urgency=low + + * Adding ghostscript, python-matplotlib, and python-pyopenssl to recommends. + * Correcting chown calls in postinst. + * Prefixing debhelper files with package name. + * Adding changelog for debian version 4.2.3.4-2. + * Dropping tinyerp-server transitional package, this allows to have both + packages available in unstable. + + -- Daniel Baumann Sun, 7 Dec 2008 20:13:00 +0100 + openerp-server (5.0.0~alpha-2) experimental; urgency=low * Renaming tinyerp-server to new upstream openerp-server name. From 0bcc4c5c8147ba1df81c50b3e2233112a7ab6fdf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:39 +0300 Subject: [PATCH 10/66] Removing openerp.dpatch, went upstream. bzr revid: p_christ@hol.gr-20090421090639-4ussj4jk3mgp5skf --- debian/patches/00list | 1 - debian/patches/02-openerp.dpatch | 815 ------------------------------- 2 files changed, 816 deletions(-) delete mode 100644 debian/patches/02-openerp.dpatch diff --git a/debian/patches/00list b/debian/patches/00list index 536a3dfe7a3..ca43e8f060f 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ 01-autobuild.dpatch -02-openerp.dpatch 03-migrate.dpatch 04-shebang.dpatch diff --git a/debian/patches/02-openerp.dpatch b/debian/patches/02-openerp.dpatch deleted file mode 100644 index 8ea3504b815..00000000000 --- a/debian/patches/02-openerp.dpatch +++ /dev/null @@ -1,815 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 02-openerp.dpatch by Daniel Baumann -## -## DP: Update homepage location. - -@DPATCH@ - -diff -Naurp openerp-server.orig/bin/addons/account/__terp__.py openerp-server/bin/addons/account/__terp__.py ---- openerp-server.orig/bin/addons/account/__terp__.py 2008-11-03 21:34:08.000000000 +0000 -+++ openerp-server/bin/addons/account/__terp__.py 2008-11-09 09:04:09.000000000 +0000 -@@ -31,7 +31,7 @@ - Taxes management - Budgets - """, -- "website" : "http://tinyerp.com/module_account.html", -+ "website" : "http://openerp.com/module_account.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [ - ], -diff -Naurp openerp-server.orig/bin/addons/account_analytic_default/__terp__.py openerp-server/bin/addons/account_analytic_default/__terp__.py ---- openerp-server.orig/bin/addons/account_analytic_default/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_analytic_default/__terp__.py 2008-11-09 09:03:55.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Account Analytic Default", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/product_analytic_default", - "description": """ - Allows to automatically select analytic accounts based on criterions: -diff -Naurp openerp-server.orig/bin/addons/account_analytic_plans/__terp__.py openerp-server/bin/addons/account_analytic_plans/__terp__.py ---- openerp-server.orig/bin/addons/account_analytic_plans/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_analytic_plans/__terp__.py 2008-11-09 09:05:13.000000000 +0000 -@@ -52,7 +52,7 @@ Plan2: - So when this line of invoice will be confirmed, it will generate 3 analytic lines, - for one account entry. - """, -- "website" : "http://tinyerp.com/module_account.html", -+ "website" : "http://openerp.com/module_account.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [ - ], -diff -Naurp openerp-server.orig/bin/addons/account_balance/__terp__.py openerp-server/bin/addons/account_balance/__terp__.py ---- openerp-server.orig/bin/addons/account_balance/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_balance/__terp__.py 2008-11-09 09:03:39.000000000 +0000 -@@ -38,7 +38,7 @@ - - 5. You have an option to print the desired report in Landscape format. - """, -- "website" : "http://tinyerp.com/account_balance.html", -+ "website" : "http://openerp.com/account_balance.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [ - ], -diff -Naurp openerp-server.orig/bin/addons/account_budget/__terp__.py openerp-server/bin/addons/account_budget/__terp__.py ---- openerp-server.orig/bin/addons/account_budget/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_budget/__terp__.py 2008-11-09 09:05:05.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Budget Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_crossovered_budget.html", -+ "website" : "http://openerp.com/module_crossovered_budget.html", - "category" : "Generic Modules/Accounting", - "description": """This module allow accountants to manage analytic and crossovered budgets. - -diff -Naurp openerp-server.orig/bin/addons/account_chart/__terp__.py openerp-server/bin/addons/account_chart/__terp__.py ---- openerp-server.orig/bin/addons/account_chart/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_chart/__terp__.py 2008-11-09 09:03:15.000000000 +0000 -@@ -25,7 +25,7 @@ - "depends" : ["account"], - "author" : "Tiny", - "description": """Remove minimal account chart""", -- "website" : "http://tinyerp.com/module_account.html", -+ "website" : "http://openerp.com/module_account.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [ - ], -diff -Naurp openerp-server.orig/bin/addons/account_date_check/__terp__.py openerp-server/bin/addons/account_date_check/__terp__.py ---- openerp-server.orig/bin/addons/account_date_check/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_date_check/__terp__.py 2008-11-09 09:05:01.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Account Date check", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["account"], - "category" : "Generic Modules/Accounting", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/account_followup/__terp__.py openerp-server/bin/addons/account_followup/__terp__.py ---- openerp-server.orig/bin/addons/account_followup/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_followup/__terp__.py 2008-11-09 09:03:29.000000000 +0000 -@@ -37,7 +37,7 @@ - It will generate a PDF with all the letters according the the - different levels of recall defined. You can define different policies - for different companies.""", -- "website" : "http://tinyerp.com/module_account.html", -+ "website" : "http://openerp.com/module_account.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [], - "demo_xml" : ["followup_demo.xml"], -diff -Naurp openerp-server.orig/bin/addons/account_invoice_layout/__terp__.py openerp-server/bin/addons/account_invoice_layout/__terp__.py ---- openerp-server.orig/bin/addons/account_invoice_layout/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_invoice_layout/__terp__.py 2008-11-09 09:03:05.000000000 +0000 -@@ -35,7 +35,7 @@ - Moreover, there is one option which allow you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions... - - """, -- "website" : "http://tinyerp.com/", -+ "website" : "http://openerp.com/", - "category" : "Generic Modules/Project & Services", - "init_xml" : [], - "demo_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/account_report/__terp__.py openerp-server/bin/addons/account_report/__terp__.py ---- openerp-server.orig/bin/addons/account_report/__terp__.py 2008-11-03 21:34:12.000000000 +0000 -+++ openerp-server/bin/addons/account_report/__terp__.py 2008-11-09 09:04:21.000000000 +0000 -@@ -25,7 +25,7 @@ - "depends" : ["account"], - "author" : "Tiny", - "description": """Financial and accounting reporting""", -- "website" : "http://tinyerp.com/module_account.html", -+ "website" : "http://openerp.com/module_account.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [ ], - "demo_xml" : [ ], -diff -Naurp openerp-server.orig/bin/addons/account_tax_include/__terp__.py openerp-server/bin/addons/account_tax_include/__terp__.py ---- openerp-server.orig/bin/addons/account_tax_include/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/account_tax_include/__terp__.py 2008-11-09 09:05:16.000000000 +0000 -@@ -29,7 +29,7 @@ Especially useful for b2c businesses. - - This module implement the modification on the invoice form. - """, -- "website" : "http://tinyerp.com/module_account.html", -+ "website" : "http://openerp.com/module_account.html", - "category" : "Generic Modules/Accounting", - "init_xml" : [ ], - "demo_xml" : [ ], -diff -Naurp openerp-server.orig/bin/addons/account_voucher/__terp__.py openerp-server/bin/addons/account_voucher/__terp__.py ---- openerp-server.orig/bin/addons/account_voucher/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/account_voucher/__terp__.py 2008-11-09 09:04:17.000000000 +0000 -@@ -35,7 +35,7 @@ - * Accounting Periods - """, - "category" : "Generic Modules/Accounting", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["base", "account"], - "init_xml" : [ - ], -@@ -51,4 +51,4 @@ - ], - "active": False, - "installable": True --} -\ No newline at end of file -+} -diff -Naurp openerp-server.orig/bin/addons/analytic_journal_billing_rate/__terp__.py openerp-server/bin/addons/analytic_journal_billing_rate/__terp__.py ---- openerp-server.orig/bin/addons/analytic_journal_billing_rate/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/analytic_journal_billing_rate/__terp__.py 2008-11-09 09:04:33.000000000 +0000 -@@ -31,7 +31,7 @@ - Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations. - - """, -- "website" : "http://tinyerp.com/", -+ "website" : "http://openerp.com/", - "category" : "Generic Modules/Others", - "init_xml" : [], - "demo_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/analytic_user_function/__terp__.py openerp-server/bin/addons/analytic_user_function/__terp__.py ---- openerp-server.orig/bin/addons/analytic_user_function/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/analytic_user_function/__terp__.py 2008-11-09 09:05:11.000000000 +0000 -@@ -31,7 +31,7 @@ - Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. - - """, -- "website" : "http://tinyerp.com/", -+ "website" : "http://openerp.com/", - "category" : "Generic Modules/Others", - "init_xml" : [], - "demo_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/auction/fr_FR.csv openerp-server/bin/addons/auction/fr_FR.csv ---- openerp-server.orig/bin/addons/auction/fr_FR.csv 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/auction/fr_FR.csv 2008-11-09 09:03:50.000000000 +0000 -@@ -4281,7 +4281,7 @@ wizard_field,"base_module_publish.module - wizard_view,"base_module_publish.module_publish,step2",0,Module publication,Publication du module - wizard_view,"base_module_publish.module_publish,step2",0,User information,Information utilisateur - wizard_view,"base_module_publish.module_publish,step2",0,Please provide here your login on the Tiny ERP website.,Tapez votre login du site Tinyerp SVP --wizard_view,"base_module_publish.module_publish,step2",0,"If you don't have an access, you can create one http://www.tinyerp.com/","Si vous n'avez pas d'accès, vous pouvez en créer un sur http;//tinyerp.com" -+wizard_view,"base_module_publish.module_publish,step2",0,"If you don't have an access, you can create one http://www.openerp.com/","Si vous n'avez pas d'accès, vous pouvez en créer un sur http;//openerp.com" - wizard_button,"base_module_publish.module_publish,step2,end",0,Cancel,Annuler - wizard_button,"base_module_publish.module_publish,step2,step1",0,Previous,Précédent - wizard_button,"base_module_publish.module_publish,step2,publish",0,Publish,publier -@@ -5119,7 +5119,7 @@ wizard_field,"base_module_publish.module - wizard_view,"base_module_publish.module_publish_all,login",0,Module publication,Publication du module - wizard_view,"base_module_publish.module_publish_all,login",0,User information,Information utilisateur - wizard_view,"base_module_publish.module_publish_all,login",0,Please provide here your login on the Tiny ERP website., --wizard_view,"base_module_publish.module_publish_all,login",0,"If you don't have an access, you can create one http://www.tinyerp.com/", -+wizard_view,"base_module_publish.module_publish_all,login",0,"If you don't have an access, you can create one http://www.openerp.com/", - wizard_button,"base_module_publish.module_publish_all,login,end",0,Cancel, - wizard_button,"base_module_publish.module_publish_all,login,publish",0,Publish, - wizard_field,"base_module_publish.module_publish_all,publish,already",0,Modules already updated, -diff -Naurp openerp-server.orig/bin/addons/audittrail/__terp__.py openerp-server/bin/addons/audittrail/__terp__.py ---- openerp-server.orig/bin/addons/audittrail/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/audittrail/__terp__.py 2008-11-09 09:02:57.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Audit Trail", - "version" : "1.0", - "depends" : ["base","account","purchase","mrp"], -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "author" : "Tiny", - "init_xml" : [], - "description": "Allows the administrator to track every user operations on all objects of the system.", -diff -Naurp openerp-server.orig/bin/addons/base_contact/__terp__.py openerp-server/bin/addons/base_contact/__terp__.py ---- openerp-server.orig/bin/addons/base_contact/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_contact/__terp__.py 2008-11-09 09:03:45.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Base Contact", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/Base Contact", - "description": """ - This module allows you to manage entirely your contacts. -diff -Naurp openerp-server.orig/bin/addons/base_module_publish/__terp__.py openerp-server/bin/addons/base_module_publish/__terp__.py ---- openerp-server.orig/bin/addons/base_module_publish/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_module_publish/__terp__.py 2008-11-09 09:03:13.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Module publisher", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/Base", - "description": """ - This module can be used by developpers to automatically publish their modules -diff -Naurp openerp-server.orig/bin/addons/base_module_record/__terp__.py openerp-server/bin/addons/base_module_record/__terp__.py ---- openerp-server.orig/bin/addons/base_module_record/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_module_record/__terp__.py 2008-11-09 09:04:02.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Module Recorder", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/Base", - "description": """ - This module allows you to create a new module without any development. -diff -Naurp openerp-server.orig/bin/addons/base_module_record/wizard/base_module_save.py openerp-server/bin/addons/base_module_record/wizard/base_module_save.py ---- openerp-server.orig/bin/addons/base_module_record/wizard/base_module_save.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_module_record/wizard/base_module_save.py 2008-11-09 09:04:00.000000000 +0000 -@@ -58,7 +58,7 @@ intro_start_fields = { - 'version': {'string':'Version', 'type':'char', 'size':16, 'required':True}, - 'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'Tiny', 'required':True}, - 'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True}, -- 'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://tinyerp.com', 'required':True}, -+ 'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://openerp.com', 'required':True}, - 'description': {'string':'Full Description', 'type':'text', 'required':True}, - 'data_kind': {'string':'Type of Data', 'type':'selection', 'selection':[('demo','Demo Data'),('update','Normal Data')], 'required':True, 'default': lambda *args:'update'}, - } -diff -Naurp openerp-server.orig/bin/addons/base_report_designer/__terp__.py openerp-server/bin/addons/base_report_designer/__terp__.py ---- openerp-server.orig/bin/addons/base_report_designer/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_report_designer/__terp__.py 2008-11-09 09:04:42.000000000 +0000 -@@ -28,7 +28,7 @@ OpenOffice. - "version" : "0.1", - "depends" : ["base"], - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/Base", - "init_xml" : [ ], - "demo_xml" : [ ], -diff -Naurp openerp-server.orig/bin/addons/base_report_designer/wizard/base_report_designer_modify.py openerp-server/bin/addons/base_report_designer/wizard/base_report_designer_modify.py ---- openerp-server.orig/bin/addons/base_report_designer/wizard/base_report_designer_modify.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_report_designer/wizard/base_report_designer_modify.py 2008-11-09 09:04:39.000000000 +0000 -@@ -41,7 +41,7 @@ intro_fields = { - 'readonly': True, - 'default': lambda *args: """This system must be used with the Tiny OpenOffice plugin. If you - did not installed yet, you can find this package on: -- http://tinyerp.com -+ http://openerp.com - - This wizard will provide you the .SXW report that you can modify - in OpenOffice. After having modified it, you will be able to reupload -diff -Naurp openerp-server.orig/bin/addons/base_setup/__terp__.py openerp-server/bin/addons/base_setup/__terp__.py ---- openerp-server.orig/bin/addons/base_setup/__terp__.py 2008-11-03 21:34:13.000000000 +0000 -+++ openerp-server/bin/addons/base_setup/__terp__.py 2008-11-09 09:04:37.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Base Setup", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/Base", - "description": """ - This module implements a configuration system that helps user -diff -Naurp openerp-server.orig/bin/addons/crm/__terp__.py openerp-server/bin/addons/crm/__terp__.py ---- openerp-server.orig/bin/addons/crm/__terp__.py 2008-11-03 21:34:14.000000000 +0000 -+++ openerp-server/bin/addons/crm/__terp__.py 2008-11-09 09:03:02.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Customer & Supplier Relationship Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_crm.html", -+ "website" : "http://openerp.com/module_crm.html", - "category" : "Generic Modules/CRM & SRM", - "description": """The Tiny ERP case and request tracker enables a group of - people to intelligently and efficiently manage tasks, issues, and requests. -diff -Naurp openerp-server.orig/bin/addons/crm_configuration/__terp__.py openerp-server/bin/addons/crm_configuration/__terp__.py ---- openerp-server.orig/bin/addons/crm_configuration/__terp__.py 2008-11-03 21:34:14.000000000 +0000 -+++ openerp-server/bin/addons/crm_configuration/__terp__.py 2008-11-09 09:04:04.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Customer Relationship Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_crm.html", -+ "website" : "http://openerp.com/module_crm.html", - "category" : "Generic Modules/CRM & SRM", - "description": """ - The Tiny ERP case and request tracker enables a group of -diff -Naurp openerp-server.orig/bin/addons/crm_profiling/__terp__.py openerp-server/bin/addons/crm_profiling/__terp__.py ---- openerp-server.orig/bin/addons/crm_profiling/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/crm_profiling/__terp__.py 2008-11-09 09:04:07.000000000 +0000 -@@ -36,7 +36,7 @@ - - * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed. - """, -- "website" : "http://tinyerp.com/", -+ "website" : "http://openerp.com/", - "category" : "Generic Modules/Project & Services", - "init_xml" : [], - "demo_xml" : ["crm_profiling_demo.xml"], -diff -Naurp openerp-server.orig/bin/addons/crm_vertical/__terp__.py openerp-server/bin/addons/crm_vertical/__terp__.py ---- openerp-server.orig/bin/addons/crm_vertical/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/crm_vertical/__terp__.py 2008-11-09 09:03:53.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "CRM Verticalisation", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Vertical Modules/Parametrization", - "description": """Simplification of the interface for CRM.""", - "depends" : ["crm_configuration"], -diff -Naurp openerp-server.orig/bin/addons/custom/__terp__.py openerp-server/bin/addons/custom/__terp__.py ---- openerp-server.orig/bin/addons/custom/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/custom/__terp__.py 2008-11-09 09:06:23.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Others", -- "website": "http://www.tinyerp.com", -+ "website": "http://www.openerp.com", - "description": "Sample custom module where you can put your customer specific developments.", - "depends" : ["base"], - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/delivery/delivery_demo.xml openerp-server/bin/addons/delivery/delivery_demo.xml ---- openerp-server.orig/bin/addons/delivery/delivery_demo.xml 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/delivery/delivery_demo.xml 2008-11-09 09:03:34.000000000 +0000 -@@ -5,7 +5,7 @@ - - - The Poste -- http://tinyerp.com -+ http://openerp.com - - - Fabien Pinckaers -diff -Naurp openerp-server.orig/bin/addons/document/__terp__.py openerp-server/bin/addons/document/__terp__.py ---- openerp-server.orig/bin/addons/document/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/document/__terp__.py 2008-11-09 09:05:41.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Others", -- "website": "http://www.tinyerp.com", -+ "website": "http://www.openerp.com", - "description": """This is a complete document management system: - * FTP Interface - * User Authentification -diff -Naurp openerp-server.orig/bin/addons/document_ics/__terp__.py openerp-server/bin/addons/document_ics/__terp__.py ---- openerp-server.orig/bin/addons/document_ics/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/document_ics/__terp__.py 2008-11-09 09:06:18.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Others", -- "website": "http://www.tinyerp.com", -+ "website": "http://www.openerp.com", - "description": """Allows to synchronize calendars with others applications.""", - "depends" : ["document","crm_configuration"], - "init_xml" : ["document_data.xml"], -diff -Naurp openerp-server.orig/bin/addons/google_map/__terp__.py openerp-server/bin/addons/google_map/__terp__.py ---- openerp-server.orig/bin/addons/google_map/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/google_map/__terp__.py 2008-11-09 09:04:31.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Google Map", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules", - "description": """The module adds google map field in partner address - so that we can directly open google map from the -diff -Naurp openerp-server.orig/bin/addons/hr/__terp__.py openerp-server/bin/addons/hr/__terp__.py ---- openerp-server.orig/bin/addons/hr/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/hr/__terp__.py 2008-11-09 09:04:28.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Human Resources", -- "website" : "http://tinyerp.com/module_hr.html", -+ "website" : "http://openerp.com/module_hr.html", - "description": """ - Module for human resource management. You can manage: - * Employees and hierarchies -diff -Naurp openerp-server.orig/bin/addons/hr_contract/__terp__.py openerp-server/bin/addons/hr_contract/__terp__.py ---- openerp-server.orig/bin/addons/hr_contract/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/hr_contract/__terp__.py 2008-11-09 09:03:00.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Human Resources", -- "website" : "http://tinyerp.com/module_hr.html", -+ "website" : "http://openerp.com/module_hr.html", - "depends" : ["hr"], - "module": "", - "description": """ -diff -Naurp openerp-server.orig/bin/addons/hr_expense/__terp__.py openerp-server/bin/addons/hr_expense/__terp__.py ---- openerp-server.orig/bin/addons/hr_expense/__terp__.py 2008-11-03 21:34:15.000000000 +0000 -+++ openerp-server/bin/addons/hr_expense/__terp__.py 2008-11-09 09:04:49.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Human Resources", -- "website" : "http://tinyerp.com/module_hr.html", -+ "website" : "http://openerp.com/module_hr.html", - "depends" : ["hr","account", "account_tax_include",], - "description": """ - This module aims to manage employee's expenses. -diff -Naurp openerp-server.orig/bin/addons/hr_holidays/__terp__.py openerp-server/bin/addons/hr_holidays/__terp__.py ---- openerp-server.orig/bin/addons/hr_holidays/__terp__.py 2008-11-03 21:34:16.000000000 +0000 -+++ openerp-server/bin/addons/hr_holidays/__terp__.py 2008-11-09 09:03:21.000000000 +0000 -@@ -4,7 +4,7 @@ - "version" : "0.1", - "author" : "Tiny & Axelor", - "category" : "Generic Modules/Human Resources", -- "website" : "http://tinyerp.com/", -+ "website" : "http://openerp.com/", - "description": """Human Ressources: Holidays tracking and workflow - - This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status. -diff -Naurp openerp-server.orig/bin/addons/hr_timesheet/__terp__.py openerp-server/bin/addons/hr_timesheet/__terp__.py ---- openerp-server.orig/bin/addons/hr_timesheet/__terp__.py 2008-11-03 21:34:16.000000000 +0000 -+++ openerp-server/bin/addons/hr_timesheet/__terp__.py 2008-11-09 09:04:11.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Human Resources", -- "website" : "http://tinyerp.com/module_hr.html", -+ "website" : "http://openerp.com/module_hr.html", - "description": """ - This module implement a timesheet system. Each employee can encode and - track their time spent on the different projects. A project is an -diff -Naurp openerp-server.orig/bin/addons/hr_timesheet_invoice/__terp__.py openerp-server/bin/addons/hr_timesheet_invoice/__terp__.py ---- openerp-server.orig/bin/addons/hr_timesheet_invoice/__terp__.py 2008-11-03 21:34:16.000000000 +0000 -+++ openerp-server/bin/addons/hr_timesheet_invoice/__terp__.py 2008-11-09 09:05:06.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Accounting", -- "website" : "http://tinyerp.com/", -+ "website" : "http://openerp.com/", - "depends" : ["account",'hr_timesheet'], - "description": """ - Module to generate invoices based on costs (human ressources, expenses, ...). -diff -Naurp openerp-server.orig/bin/addons/hr_timesheet_project/__terp__.py openerp-server/bin/addons/hr_timesheet_project/__terp__.py ---- openerp-server.orig/bin/addons/hr_timesheet_project/__terp__.py 2008-11-03 21:34:16.000000000 +0000 -+++ openerp-server/bin/addons/hr_timesheet_project/__terp__.py 2008-11-09 09:02:58.000000000 +0000 -@@ -25,7 +25,7 @@ - "author" : "Tiny", - "category" : "Generic Modules/Human Resources", - "description": """Auto-complete timesheet based on tasks made on the project management module.""", -- "website" : "http://tinyerp.com/module_hr.html", -+ "website" : "http://openerp.com/module_hr.html", - "depends" : ["project", "hr_timesheet_sheet"], - "update_xml" : ["hr_timesheet_project_view.xml", - "process/hr_timesheet_project_process.xml", -diff -Naurp openerp-server.orig/bin/addons/hr_timesheet_sheet/__terp__.py openerp-server/bin/addons/hr_timesheet_sheet/__terp__.py ---- openerp-server.orig/bin/addons/hr_timesheet_sheet/__terp__.py 2008-11-03 21:34:16.000000000 +0000 -+++ openerp-server/bin/addons/hr_timesheet_sheet/__terp__.py 2008-11-09 09:03:11.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Human Resources", -- "website" : "http://tinyerp.com/module_hr.html", -+ "website" : "http://openerp.com/module_hr.html", - "description": """ - This module help you easily encode and validate timesheet and attendances - within the same view. The upper part of the view is for attendances and -diff -Naurp openerp-server.orig/bin/addons/mrp/__terp__.py openerp-server/bin/addons/mrp/__terp__.py ---- openerp-server.orig/bin/addons/mrp/__terp__.py 2008-11-03 21:34:17.000000000 +0000 -+++ openerp-server/bin/addons/mrp/__terp__.py 2008-11-09 09:05:08.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Manufacturing Resource Planning", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_mrp.html", -+ "website" : "http://openerp.com/module_mrp.html", - "category" : "Generic Modules/Production", - "depends" : ["stock", "hr", "purchase", "product", "process"], - "description": """ -diff -Naurp openerp-server.orig/bin/addons/mrp_operations/__terp__.py openerp-server/bin/addons/mrp_operations/__terp__.py ---- openerp-server.orig/bin/addons/mrp_operations/__terp__.py 2008-11-03 21:34:17.000000000 +0000 -+++ openerp-server/bin/addons/mrp_operations/__terp__.py 2008-11-09 09:03:14.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Workcenter Production start end workflow", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_mrp.html", -+ "website" : "http://openerp.com/module_mrp.html", - "category" : "Generic Modules/Production", - "depends" : ["stock", "hr", "purchase", "product", "mrp"], - "description": """ -diff -Naurp openerp-server.orig/bin/addons/mrp_subproduct/__terp__.py openerp-server/bin/addons/mrp_subproduct/__terp__.py ---- openerp-server.orig/bin/addons/mrp_subproduct/__terp__.py 2008-11-03 21:34:17.000000000 +0000 -+++ openerp-server/bin/addons/mrp_subproduct/__terp__.py 2008-11-09 09:03:57.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "MRP Sub Product", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_stock.html", -+ "website" : "http://openerp.com/module_stock.html", - "depends" : ["base","mrp"], - "category" : "Generic Modules/Production", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/process/__terp__.py openerp-server/bin/addons/process/__terp__.py ---- openerp-server.orig/bin/addons/process/__terp__.py 2008-11-03 21:34:17.000000000 +0000 -+++ openerp-server/bin/addons/process/__terp__.py 2008-11-09 09:04:25.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Enterprise Process", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/Base", - "description": """ - This module allows you to manage your process for the end-users. -diff -Naurp openerp-server.orig/bin/addons/project/__terp__.py openerp-server/bin/addons/project/__terp__.py ---- openerp-server.orig/bin/addons/project/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/project/__terp__.py 2008-11-09 09:03:43.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Project Management", - "version": "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_project.html", -+ "website" : "http://openerp.com/module_project.html", - "category" : "Generic Modules/Projects & Services", - "depends" : ["product", "account", "hr", "process"], - "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.", -diff -Naurp openerp-server.orig/bin/addons/project_mrp/__terp__.py openerp-server/bin/addons/project_mrp/__terp__.py ---- openerp-server.orig/bin/addons/project_mrp/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/project_mrp/__terp__.py 2008-11-09 09:02:54.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Project Management - MRP Link", - "version": "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_project.html", -+ "website" : "http://openerp.com/module_project.html", - "category" : "Generic Modules/Projects & Services", - "depends" : ["project", 'mrp', "sale"], - "description": """ -diff -Naurp openerp-server.orig/bin/addons/project_timesheet/__terp__.py openerp-server/bin/addons/project_timesheet/__terp__.py ---- openerp-server.orig/bin/addons/project_timesheet/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/project_timesheet/__terp__.py 2008-11-09 09:04:13.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Project Timesheet", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "category" : "Generic Modules/HR", - "description": """ - This module lets you transfer the entries under tasks defined for Project Management to -diff -Naurp openerp-server.orig/bin/addons/purchase/__terp__.py openerp-server/bin/addons/purchase/__terp__.py ---- openerp-server.orig/bin/addons/purchase/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/purchase/__terp__.py 2008-11-09 09:03:07.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Purchase Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_purchase.html", -+ "website" : "http://openerp.com/module_purchase.html", - "depends" : ["base", "account", "stock", "process"], - "category" : "Generic Modules/Sales & Purchases", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/purchase_analytic_plans/__terp__.py openerp-server/bin/addons/purchase_analytic_plans/__terp__.py ---- openerp-server.orig/bin/addons/purchase_analytic_plans/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/purchase_analytic_plans/__terp__.py 2008-11-09 09:03:17.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Purchase Analytic Distribution Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["purchase","account_analytic_plans"], - "category" : "Generic Modules/Sales & Purchases", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/report_account/__terp__.py openerp-server/bin/addons/report_account/__terp__.py ---- openerp-server.orig/bin/addons/report_account/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/report_account/__terp__.py 2008-11-09 09:04:30.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Account Reporting - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["account"], - "category" : "Generic Modules/Accounting", - "description": "A module that adds new reports based on the account module.", -diff -Naurp openerp-server.orig/bin/addons/report_analytic/__terp__.py openerp-server/bin/addons/report_analytic/__terp__.py ---- openerp-server.orig/bin/addons/report_analytic/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/report_analytic/__terp__.py 2008-11-09 09:04:19.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Analytic Account Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["account","hr_timesheet_invoice"], - "category" : "Generic Modules/Accounting", - "description": "A module that adds new reports based on analytic accounts.", -diff -Naurp openerp-server.orig/bin/addons/report_analytic_line/__terp__.py openerp-server/bin/addons/report_analytic_line/__terp__.py ---- openerp-server.orig/bin/addons/report_analytic_line/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/report_analytic_line/__terp__.py 2008-11-09 09:04:45.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Analytic lines - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["account", "hr_timesheet_invoice"], - "category" : "Generic Modules/Accounting", - "description": "A report on analytic lines, costs by products, months and accounts.", -diff -Naurp openerp-server.orig/bin/addons/report_analytic_planning/__terp__.py openerp-server/bin/addons/report_analytic_planning/__terp__.py ---- openerp-server.orig/bin/addons/report_analytic_planning/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/report_analytic_planning/__terp__.py 2008-11-09 09:05:03.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Analytic planning - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["account", "hr_timesheet_invoice","project","report_analytic_line"], - "category" : "Generic Modules/Accounting", - "description": "Planning on analytic accounts.", -diff -Naurp openerp-server.orig/bin/addons/report_crm/__terp__.py openerp-server/bin/addons/report_crm/__terp__.py ---- openerp-server.orig/bin/addons/report_crm/__terp__.py 2008-11-03 21:34:18.000000000 +0000 -+++ openerp-server/bin/addons/report_crm/__terp__.py 2008-11-09 09:03:41.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "CRM Management - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_crm.html", -+ "website" : "http://openerp.com/module_crm.html", - "depends" : ["crm"], - "category" : "Generic Modules/CRM & SRM", - "description": "A module that adds new reports based on CRM cases.", -diff -Naurp openerp-server.orig/bin/addons/report_intrastat/__terp__.py openerp-server/bin/addons/report_intrastat/__terp__.py ---- openerp-server.orig/bin/addons/report_intrastat/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/report_intrastat/__terp__.py 2008-11-09 09:03:10.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Intrastat Reporting - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["base", "product", "stock", "sale", "purchase"], - "category" : "Generic Modules/Inventory Control", - "description": "A module that adds intrastat reports.", -diff -Naurp openerp-server.orig/bin/addons/report_mrp/__terp__.py openerp-server/bin/addons/report_mrp/__terp__.py ---- openerp-server.orig/bin/addons/report_mrp/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/report_mrp/__terp__.py 2008-11-09 09:04:23.000000000 +0000 -@@ -23,7 +23,7 @@ - "name": "MRP Management - Reporting", - "version": "1.0", - "author": "Tiny", -- "website": "http://tinyerp.com/module_mrp.html", -+ "website": "http://openerp.com/module_mrp.html", - "depends": ["mrp"], - "category": "Generic Modules/Production", - "description": "A module that adds new reports based on MRP cases.", -diff -Naurp openerp-server.orig/bin/addons/report_project/__terp__.py openerp-server/bin/addons/report_project/__terp__.py ---- openerp-server.orig/bin/addons/report_project/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/report_project/__terp__.py 2008-11-09 09:03:37.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Sales Management - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_project.html", -+ "website" : "http://openerp.com/module_project.html", - "depends" : ["project", "report_task"], - "category" : "Generic Modules/Sales & Purchases", - "description": "A module that adds some reports on the sales", -diff -Naurp openerp-server.orig/bin/addons/report_purchase/__terp__.py openerp-server/bin/addons/report_purchase/__terp__.py ---- openerp-server.orig/bin/addons/report_purchase/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/report_purchase/__terp__.py 2008-11-09 09:03:01.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Sales Management - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_purchase.html", -+ "website" : "http://openerp.com/module_purchase.html", - "depends" : ["purchase"], - "category" : "Generic Modules/Sales & Purchases", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/report_sale/__terp__.py openerp-server/bin/addons/report_sale/__terp__.py ---- openerp-server.orig/bin/addons/report_sale/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/report_sale/__terp__.py 2008-11-09 09:04:15.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Sales Management - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["sale"], - "category" : "Generic Modules/Sales & Purchases", - "description": """ -diff -Naurp openerp-server.orig/bin/addons/report_timesheet/__terp__.py openerp-server/bin/addons/report_timesheet/__terp__.py ---- openerp-server.orig/bin/addons/report_timesheet/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/report_timesheet/__terp__.py 2008-11-09 09:03:31.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Timesheet - Reporting", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com", -+ "website" : "http://openerp.com", - "depends" : ["hr_timesheet",'hr_timesheet_invoice'], - "category" : "Generic Modules/Human Ressources", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/sale/__terp__.py openerp-server/bin/addons/sale/__terp__.py ---- openerp-server.orig/bin/addons/sale/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/sale/__terp__.py 2008-11-09 09:04:47.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Sales Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["product", "stock", "mrp", "process"], - "category" : "Generic Modules/Sales & Purchases", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/sale_analytic_plans/__terp__.py openerp-server/bin/addons/sale_analytic_plans/__terp__.py ---- openerp-server.orig/bin/addons/sale_analytic_plans/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/sale_analytic_plans/__terp__.py 2008-11-09 09:04:44.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Sales Analytic Distribution Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["sale","account_analytic_plans"], - "category" : "Generic Modules/Sales & Purchases", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/sale_crm/__terp__.py openerp-server/bin/addons/sale_crm/__terp__.py ---- openerp-server.orig/bin/addons/sale_crm/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/sale_crm/__terp__.py 2008-11-09 09:04:27.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Sale CRM Stuff", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["sale", "crm_configuration"], - "category" : "Generic Modules/Sales & Purchases", - "description": """ -diff -Naurp openerp-server.orig/bin/addons/sale_journal/__terp__.py openerp-server/bin/addons/sale_journal/__terp__.py ---- openerp-server.orig/bin/addons/sale_journal/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/sale_journal/__terp__.py 2008-11-09 09:06:20.000000000 +0000 -@@ -24,7 +24,7 @@ - "version" : "1.0", - "author" : "Tiny", - "category" : "Generic Modules/Sales & Purchases", -- "website": "http://www.tinyerp.com", -+ "website": "http://www.openerp.com", - "depends" : ["stock","sale"], - "demo_xml" : ['sale_journal_demo.xml'], - "init_xml" : ['sale_journal_data.xml'], -diff -Naurp openerp-server.orig/bin/addons/stock/__terp__.py openerp-server/bin/addons/stock/__terp__.py ---- openerp-server.orig/bin/addons/stock/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/stock/__terp__.py 2008-11-09 09:03:08.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Stock Management", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_stock.html", -+ "website" : "http://openerp.com/module_stock.html", - "depends" : ["product", "account"], - "category" : "Generic Modules/Inventory Control", - "init_xml" : [], -diff -Naurp openerp-server.orig/bin/addons/stock_invoice_directly/__terp__.py openerp-server/bin/addons/stock_invoice_directly/__terp__.py ---- openerp-server.orig/bin/addons/stock_invoice_directly/__terp__.py 2008-11-03 21:34:19.000000000 +0000 -+++ openerp-server/bin/addons/stock_invoice_directly/__terp__.py 2008-11-09 09:05:09.000000000 +0000 -@@ -23,7 +23,7 @@ - "name" : "Invoice Picking Directly", - "version" : "1.0", - "author" : "Tiny", -- "website" : "http://tinyerp.com/module_sale.html", -+ "website" : "http://openerp.com/module_sale.html", - "depends" : ["delivery"], - "category" : "Generic Modules/Sales & Purchases", - "description": """ From 547068f0246b8b56d593b287e243c4a0991df66e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:39 +0300 Subject: [PATCH 11/66] Rediffing shebang.dpatch. bzr revid: p_christ@hol.gr-20090421090639-pzxor4icbed9qg7s --- debian/patches/04-shebang.dpatch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/04-shebang.dpatch b/debian/patches/04-shebang.dpatch index 748d2aef330..3a2f1671789 100644 --- a/debian/patches/04-shebang.dpatch +++ b/debian/patches/04-shebang.dpatch @@ -1,25 +1,25 @@ #!/bin/sh /usr/share/dpatch/dpatch-run ## 04-shebang.dpatch by Daniel Baumann ## -## DP: Correct shebank. +## DP: Correcting shebang. @DPATCH@ diff -Naurp openerp-server.orig/bin/addons/auction/barcode/test.py openerp-server/bin/addons/auction/barcode/test.py ---- openerp-server.orig/bin/addons/auction/barcode/test.py 2008-11-09 13:50:48.000000000 +0000 -+++ openerp-server/bin/addons/auction/barcode/test.py 2008-11-09 13:57:57.000000000 +0000 +--- openerp-server.orig/bin/addons/auction/barcode/test.py 2008-12-16 11:06:21.000000000 +0000 ++++ openerp-server/bin/addons/auction/barcode/test.py 2008-12-16 11:27:19.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/pkg/bin/python +#!/usr/bin/python from common import * from code39 import * from code93 import * -diff -Naurp openerp-server.orig/bin/addons/base/ir/workflow/pydot/dot_parser.py openerp-server/bin/addons/base/ir/workflow/pydot/dot_parser.py ---- openerp-server.orig/bin/addons/base/ir/workflow/pydot/dot_parser.py 2008-11-09 13:50:48.000000000 +0000 -+++ openerp-server/bin/addons/base/ir/workflow/pydot/dot_parser.py 2008-11-09 13:58:15.000000000 +0000 +diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py +--- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:06:22.000000000 +0000 ++++ openerp-server/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:28:19.000000000 +0000 @@ -1,4 +1,4 @@ --#!/bin/env python +-#!/usr/bin/env python +#!/usr/bin/python - - """ - The dotparser parses graphviz files in dot and dot files and transforms them + # ftpserver.py + # + # pyftpdlib is released under the MIT license, reproduced below: From 9087cac55722f6bf5662c2ad62e249c8dd4012a7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:39 +0300 Subject: [PATCH 12/66] Removing workaround for import_xml.rng, not needed anymore. bzr revid: p_christ@hol.gr-20090421090639-617vzk9oz80ay6dk --- debian/rules | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/rules b/debian/rules index d56e2ad3c0d..c716b2448e8 100755 --- a/debian/rules +++ b/debian/rules @@ -30,9 +30,6 @@ install: build mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib rm -rf debian/openerp-server/usr/lib/python* - # Workaround for bug in setup.py - mv debian/openerp-server/usr/import_xml.rng debian/openerp-server/usr/lib/openerp-server - # Fixing permissions find debian/openerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644 From 0b68803357e56dcdd3499dbcd54801a2fa1fb715 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:39 +0300 Subject: [PATCH 13/66] Releasing debian version 5.0.0~rc1-1. bzr revid: p_christ@hol.gr-20090421090639-qyerw8q8edrldotz --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 03e522eccbb..feae570a6c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +openerp-server (5.0.0~rc1-1) unstable; urgency=low + + * Merging upstream version 5.0.0~rc1. + * Removing openerp.dpatch, went upstream. + * Rediffing shebang.dpatch. + * Removing workaround for import_xml.rng, not needed anymore. + + -- Daniel Baumann Tue, 16 Dec 2008 12:51:00 +0100 + openerp-server (5.0.0~alpha-3) unstable; urgency=low * Adding ghostscript, python-matplotlib, and python-pyopenssl to recommends. From 9e96b9b95849f78b2c2a8daf5548e9e8cca5b88f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:40 +0300 Subject: [PATCH 14/66] Releasing debian version 5.0.0~rc1.1-1. bzr revid: p_christ@hol.gr-20090421090640-f430brr1mm3mlwae --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index feae570a6c3..11b1b4079eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.0~rc1.1-1) unstable; urgency=low + + * Merging upstream version 5.0.0~rc1.1. + + -- Daniel Baumann Tue, 16 Dec 2008 13:08:00 +0100 + openerp-server (5.0.0~rc1-1) unstable; urgency=low * Merging upstream version 5.0.0~rc1. From 9ed94c322369f89cddf4fe0d9265ee7ad904df9f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:40 +0300 Subject: [PATCH 15/66] Adjusting sed call to correct path in /usr/bin/openerp-server. bzr revid: p_christ@hol.gr-20090421090640-whxoc13amnpkjjib --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c716b2448e8..9c75747afc4 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ install: build python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr # Adjusting program location - sed -i -e 's|python.*/site-packages/||' debian/openerp-server/usr/bin/openerp-server + sed -i -e 's|cd .*python.*/site-packages|cd /usr/lib|' debian/openerp-server/usr/bin/openerp-server mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib rm -rf debian/openerp-server/usr/lib/python* From e5b88739eb74fb2d8f222477b88cfd45f32ac2c4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:40 +0300 Subject: [PATCH 16/66] Releasing debian version 5.0.0~rc1.1-2. bzr revid: p_christ@hol.gr-20090421090640-5bx02nntc82c338u --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 11b1b4079eb..bb4de86dd9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.0~rc1.1-2) unstable; urgency=low + + * Adjusting sed call to correct path in /usr/bin/openerp-server. + + -- Daniel Baumann Wed, 17 Dec 2008 08:32:00 +0100 + openerp-server (5.0.0~rc1.1-1) unstable; urgency=low * Merging upstream version 5.0.0~rc1.1. From 9f4e02abc155008b87b8d76f515d0b9e9e875a04 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:40 +0300 Subject: [PATCH 17/66] Updating python xml depends (Closes: #508911). bzr revid: p_christ@hol.gr-20090421090640-u9651hc5wp2duy8z --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index d1266c94721..bf3c64d725f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), dpatch, python-dev -Build-Depends-Indep: python-libxml2, python-libxslt1, python-psycopg +Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg Standards-Version: 3.8.0 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git @@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.net/git/debian/openerp-server.git Package: openerp-server Section: net Architecture: all -Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz +Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg, python-reportlab, python-tz Conflicts: tinyerp-server Replaces: tinyerp-server Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-pyopenssl, python-pyparsing From a02cf1631ff8ab48508fd97e3a42dafcf8911740 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:40 +0300 Subject: [PATCH 18/66] New upstream no longer uses embedded copies of pydot, pychart and reportlab (Closes: #468104). bzr revid: p_christ@hol.gr-20090421090640-opepm1q71oex98y1 --- debian/control | 4 +-- debian/copyright | 67 ------------------------------------------------ 2 files changed, 2 insertions(+), 69 deletions(-) diff --git a/debian/control b/debian/control index bf3c64d725f..34a0494fef2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), dpatch, python-dev -Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg +Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 Standards-Version: 3.8.0 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git @@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.net/git/debian/openerp-server.git Package: openerp-server Section: net Architecture: all -Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg, python-reportlab, python-tz +Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg2, python-reportlab, python-pychart, python-pydot, python-tz Conflicts: tinyerp-server Replaces: tinyerp-server Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-pyopenssl, python-pyparsing diff --git a/debian/copyright b/debian/copyright index 4bdf8e97d66..1d87b615d5d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -96,27 +96,6 @@ License: BSD ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: bin/addons/base/ir/workflow/pydot/* -Copyright: (C) 2004 Ero Carrera -License: other - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - Files: bin/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl bin/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py @@ -205,52 +184,6 @@ License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. -Files: bin/pychart/* -Copyright: (C) 2000-2005 Yasushi Saito -License: GPL-2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2 file. - -Files: bin/reportlab/* -Copyright: (C) 2000-2004 ReportLab Inc. -License: BSD - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the company nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE OFFICERS OR CONTRIBUTORS BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Files: bin/tools/threadinglocal.py Copyright: (C) 2004-2005 CherryPy Team License: BSD From 9860d7c85f6067945f3d9c5aea9ebb30e2a22f42 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:41 +0300 Subject: [PATCH 19/66] Rediffing shebang.dpatch. bzr revid: p_christ@hol.gr-20090421090641-ybt5a0wsvl1evoi8 --- debian/patches/04-shebang.dpatch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/debian/patches/04-shebang.dpatch b/debian/patches/04-shebang.dpatch index 3a2f1671789..12cda65a8cc 100644 --- a/debian/patches/04-shebang.dpatch +++ b/debian/patches/04-shebang.dpatch @@ -5,15 +5,6 @@ @DPATCH@ -diff -Naurp openerp-server.orig/bin/addons/auction/barcode/test.py openerp-server/bin/addons/auction/barcode/test.py ---- openerp-server.orig/bin/addons/auction/barcode/test.py 2008-12-16 11:06:21.000000000 +0000 -+++ openerp-server/bin/addons/auction/barcode/test.py 2008-12-16 11:27:19.000000000 +0000 -@@ -1,4 +1,4 @@ --#!/usr/pkg/bin/python -+#!/usr/bin/python - from common import * - from code39 import * - from code93 import * diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py --- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:06:22.000000000 +0000 +++ openerp-server/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:28:19.000000000 +0000 From 6182bb1bbc6d4ead645f1211d873c5699f88e137 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:41 +0300 Subject: [PATCH 20/66] Releasing debian version 5.0.0~rc2-1. bzr revid: p_christ@hol.gr-20090421090641-r3c2nfcgzmqdkb79 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index bb4de86dd9a..222bdc41e60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +openerp-server (5.0.0~rc2-1) unstable; urgency=low + + * Updating python xml depends (Closes: #508911). + * Merging upstream version 5.0.0~rc2. + * New upstream no longer uses embedded copies of pydot, pychart and + reportlab (Closes: #468104). + * Rediffing shebang.dpatch. + + -- Daniel Baumann Thu, 25 Dec 2008 15:13:00 +0100 + openerp-server (5.0.0~rc1.1-2) unstable; urgency=low * Adjusting sed call to correct path in /usr/bin/openerp-server. From 6369e3da353be410f767ee017d91e754d32e017c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:41 +0300 Subject: [PATCH 21/66] Adding note about initializing the database in README.Debian. bzr revid: p_christ@hol.gr-20090421090641-b7w3r796prw3gjqu --- debian/openerp-server.README.Debian | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 1fd378c7e72..9121c5ef68b 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -21,7 +21,11 @@ explanation how to achieve this (you need to execute all commands as root): to replace 'openerp' above with the user you want instead, and you need to adjust 'db_user = openerp' in /etc/openerp-server.conf too. - 3. Restarting openerp-server + 4. Initializing the database + + # /usr/bin/openerp-server --init=all + + 5. Restarting openerp-server # /etc/init.d/openerp-server restart From 43b8d506e8f820966bcd709669dafb2b78cda5f0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:41 +0300 Subject: [PATCH 22/66] Adding changelog for debian version 4.2.3.4-3. bzr revid: p_christ@hol.gr-20090421090641-5r0n3qg131yc5jfn --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 222bdc41e60..724ef1e0575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,14 @@ tinyerp-server (5.0.0~alpha-1) experimental; urgency=low -- Daniel Baumann Sun, 9 Nov 2008 15:52:00 +0100 +tinyerp-server (4.2.3.4-3) unstable; urgency=high + + * Updating python depends (Closes: #506615). + * Adding note about initializising the database in README.Debian + (Closes: #464557). + + -- Daniel Baumann Mon, 10 Nov 2008 12:40:00 +0100 + tinyerp-server (4.2.3.4-2) unstable; urgency=low * Correcting chown calls in postinst. From 1a825578e1e3cd9dfbb4cfb726f5bcf7a6e6a67e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:41 +0300 Subject: [PATCH 23/66] Using quilt rather than dpatch. bzr revid: p_christ@hol.gr-20090421090641-0nhtv4ks4ahkpu23 --- debian/control | 2 +- debian/patches/00list | 3 --- .../{01-autobuild.dpatch => 01-autobuild.patch} | 8 ++------ debian/patches/{03-migrate.dpatch => 02-migrate.patch} | 8 ++------ debian/patches/{04-shebang.dpatch => 03-shebang.patch} | 8 ++------ debian/patches/series | 3 +++ debian/rules | 10 +++++----- 7 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{01-autobuild.dpatch => 01-autobuild.patch} (68%) rename debian/patches/{03-migrate.dpatch => 02-migrate.patch} (82%) rename debian/patches/{04-shebang.dpatch => 03-shebang.patch} (77%) create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index 34a0494fef2..1a3e6567b16 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openerp-server Section: net Priority: optional Maintainer: Daniel Baumann -Build-Depends: debhelper (>= 7), dpatch, python-dev +Build-Depends: debhelper (>= 7), quilt, python-dev Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 Standards-Version: 3.8.0 Homepage: http://www.openerp.com/ diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index ca43e8f060f..00000000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -01-autobuild.dpatch -03-migrate.dpatch -04-shebang.dpatch diff --git a/debian/patches/01-autobuild.dpatch b/debian/patches/01-autobuild.patch similarity index 68% rename from debian/patches/01-autobuild.dpatch rename to debian/patches/01-autobuild.patch index 25b00dd8c63..eb1fb1e2d79 100644 --- a/debian/patches/01-autobuild.dpatch +++ b/debian/patches/01-autobuild.patch @@ -1,9 +1,5 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01-autobuild.dpatch by Daniel Baumann -## -## DP: Disable modules check to make it buildable without X11. - -@DPATCH@ +Author: Daniel Baumann +Description: Disable modules check to make it buildable without X11. diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py --- openerp-server.orig/setup.py 2008-11-03 21:33:56.000000000 +0000 diff --git a/debian/patches/03-migrate.dpatch b/debian/patches/02-migrate.patch similarity index 82% rename from debian/patches/03-migrate.dpatch rename to debian/patches/02-migrate.patch index 3bde7b143eb..3004042cb5b 100644 --- a/debian/patches/03-migrate.dpatch +++ b/debian/patches/02-migrate.patch @@ -1,9 +1,5 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 03-migrate.dpatch by Brian DeRocher -## -## DP: Correct SQL syntax in migrate script (Closes: #467517). - -@DPATCH@ +Author: Brian DeRocher +Description: Correct SQL syntax in migrate script (Closes: #467517). diff -Naurp openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py openerp-server/doc/migrate/3.4.0-4.0.0/pre.py --- openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-03 21:33:56.000000000 +0000 diff --git a/debian/patches/04-shebang.dpatch b/debian/patches/03-shebang.patch similarity index 77% rename from debian/patches/04-shebang.dpatch rename to debian/patches/03-shebang.patch index 12cda65a8cc..7add479b084 100644 --- a/debian/patches/04-shebang.dpatch +++ b/debian/patches/03-shebang.patch @@ -1,9 +1,5 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 04-shebang.dpatch by Daniel Baumann -## -## DP: Correcting shebang. - -@DPATCH@ +Author: Daniel Baumann +Description: Correcting shebang. diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py --- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:06:22.000000000 +0000 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000000..6d5ba4c38b4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +01-autobuild.patch +02-migrate.patch +03-shebang.patch diff --git a/debian/rules b/debian/rules index 9c75747afc4..83d9bfa54fe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f -include /usr/share/dpatch/dpatch.make +include /usr/share/quilt/quilt.make clean: clean-patched unpatch -clean-patched: patch-stamp +clean-patched: patch dh_testdir dh_testroot rm -f build-stamp @@ -15,9 +15,9 @@ clean-patched: patch-stamp dh_clean -build: patch-stamp +build: -install: build +install: patch dh_testdir dh_testroot dh_prep @@ -40,7 +40,7 @@ binary: binary-indep binary-arch: -binary-indep: build install +binary-indep: install dh_testdir dh_testroot dh_installchangelogs doc/Changelog From 96af71d385a13df4289ce9cfdc9ad88e9332ccdd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:42 +0300 Subject: [PATCH 24/66] Updating year in copyright file. bzr revid: p_christ@hol.gr-20090421090642-xm9wd7154rdd3mnb --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 1d87b615d5d..6a75021214c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ Author: Tiny.be Download: http://www.openerp.com/ Files: * -Copyright: (C) 2004-2008 Tiny.be +Copyright: (C) 2004-2009 Tiny.be License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -226,7 +226,7 @@ License: other permission. Files: debian/* -Copyright: (C) 2005-2008 Daniel Baumann +Copyright: (C) 2005-2009 Daniel Baumann License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 7dfbd660d93f7c9be28305c7f729eea1d9a04302 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:42 +0300 Subject: [PATCH 25/66] Updating python-openssl depends. bzr revid: p_christ@hol.gr-20090421090642-bpvqtuhk3ko4gap5 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1a3e6567b16..484bdf8714b 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Architecture: all Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg2, python-reportlab, python-pychart, python-pydot, python-tz Conflicts: tinyerp-server Replaces: tinyerp-server -Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-pyopenssl, python-pyparsing +Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-openssl, python-pyparsing Suggests: openerp-client Description: Enterprise Resource Management (server) OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main From 89253eeae3eb9e87e9063b5a94cf06f90d5c6d67 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:42 +0300 Subject: [PATCH 26/66] Updating lintian overrides. bzr revid: p_christ@hol.gr-20090421090642-iv76k9d0ump1r4nf --- debian/openerp-server.lintian-overrides | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/openerp-server.lintian-overrides b/debian/openerp-server.lintian-overrides index b99e0ccf133..25b1165c4be 100644 --- a/debian/openerp-server.lintian-overrides +++ b/debian/openerp-server.lintian-overrides @@ -1,3 +1,7 @@ # Add-on directories needs data directories, and sometimes they are # (intentionally) empty, hence overriting the lintian warning. openerp-server: package-contains-empty-directory +# Add-on directoires contain images sometimes, but it's nothing that is +# worthwile to be splittet out to /usr/share as it's all manual work for each +# release. +openerp-server: image-file-in-usr-lib From e7cc3e3147ec056bde5959eac2e0e633aa3e0a8f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:42 +0300 Subject: [PATCH 27/66] Releasing debian version 5.0.0~rc3-1. bzr revid: p_christ@hol.gr-20090421090642-0daqqmcifjkrl7q5 --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 724ef1e0575..8e1ed14de53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +openerp-server (5.0.0~rc3-1) unstable; urgency=low + + * Adding note about initializing the database in README.Debian. + * Adding changelog for debian version 4.2.3.4-3. + * Merging upstream version 5.0.0~rc3. + * Using quilt rather than dpatch. + * Updating year in copyright file. + * Updating python-openssl depends. + * Updating lintian overrides. + + -- Daniel Baumann Fri, 9 Jan 2009 18:31:00 -0500 + openerp-server (5.0.0~rc2-1) unstable; urgency=low * Updating python xml depends (Closes: #508911). From 6cbf1aecf25e3a826d30e29a48b55616c6cd0496 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:43 +0300 Subject: [PATCH 28/66] Releasing debian version 5.0.0-1. bzr revid: p_christ@hol.gr-20090421090643-ctny4w05q3no35b3 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8e1ed14de53..e429e09d33d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.0-1) unstable; urgency=low + + * Merging upstream version 5.0.0. + + -- Daniel Baumann Sat, 7 Feb 2009 13:33:00 +0100 + openerp-server (5.0.0~rc3-1) unstable; urgency=low * Adding note about initializing the database in README.Debian. From d18f66186ef2fb6b85b27f6b6cdc996c6f6ea4ab Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:43 +0300 Subject: [PATCH 29/66] Updating README.Debian. bzr revid: p_christ@hol.gr-20090421090643-2lxs9396rxcfbaht --- debian/openerp-server.README.Debian | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 9121c5ef68b..1b83104b366 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -7,7 +7,11 @@ explanation how to achieve this (you need to execute all commands as root): 0. Making sure, PostgreSQL is running - # /etc/init.d/postgresql* restart + # /etc/init.d/postgresql restart + + Note that depending on the version of PostgreSQL installed on your system, + the above syvinit script could also be named postgresql-VERSION (whereas + 'VERSION' needs to be replace with a version number). 1. Creating the database @@ -23,7 +27,7 @@ explanation how to achieve this (you need to execute all commands as root): 4. Initializing the database - # /usr/bin/openerp-server --init=all + # su - postgres -c "/usr/sbin/openerp-server --init=all" 5. Restarting openerp-server From f9a1e99b12f65966119623dc0f91fd7f36f18827 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:43 +0300 Subject: [PATCH 30/66] Releasing debian version 5.0.0-2-1. bzr revid: p_christ@hol.gr-20090421090643-0i5ve8r6vtgeojwi --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e429e09d33d..ac290837b06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openerp-server (5.0.0-2-1) unstable; urgency=low + + * Merging upstream version 5.0.0-2 (Closes: #514920). + * Updating README.Debian. + + -- Daniel Baumann Sat, 14 Feb 2009 00:12:00 +0100 + openerp-server (5.0.0-1) unstable; urgency=low * Merging upstream version 5.0.0. From 2a78928132edf5b7544b76a2a7ef8b8a87947892 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:43 +0300 Subject: [PATCH 31/66] Improving init call in README.Debian, thanks to David Goodenough . bzr revid: p_christ@hol.gr-20090421090643-vk4xri1rp9wj7euq --- debian/openerp-server.README.Debian | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 1b83104b366..13e7dde7295 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -27,7 +27,8 @@ explanation how to achieve this (you need to execute all commands as root): 4. Initializing the database - # su - postgres -c "/usr/sbin/openerp-server --init=all" + # su - postgres -c "/usr/sbin/openerp-server --init=all \ + --config=/etc/openerp-server.conf --stop-after-init" 5. Restarting openerp-server From add4378fe731dc4b9c900b61e3d2e5ae15594fa8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:44 +0300 Subject: [PATCH 32/66] Fixed wrapping in README.Debian. bzr revid: p_christ@hol.gr-20090421090644-32g553pek7yfzf4k --- debian/openerp-server.README.Debian | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 13e7dde7295..8414958ba41 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -21,9 +21,9 @@ explanation how to achieve this (you need to execute all commands as root): # su - postgres -c "createuser -q --createdb --adduser openerp" - Note: If you want to run the database as another user than 'openerp', you need - to replace 'openerp' above with the user you want instead, and you need to - adjust 'db_user = openerp' in /etc/openerp-server.conf too. + Note: If you want to run the database as another user than 'openerp', you + need to replace 'openerp' above with the user you want instead, and you + need to adjust 'db_user = openerp' in /etc/openerp-server.conf too. 4. Initializing the database From 0774d59d63b87898087ac3eff719e4b2e8e3dc69 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Apr 2009 12:06:44 +0300 Subject: [PATCH 33/66] Releasing debian version 5.0.0-3-1. bzr revid: p_christ@hol.gr-20090421090644-raim0hz25aveqaz2 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac290837b06..f9bf2aa9869 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +openerp-server (5.0.0-3-1) unstable; urgency=low + + * Merging upstream version 5.0.0-3. + * Improving init call in README.Debian, thanks to David Goodenough + . + * Fixed wrapping in README.Debian. + + -- Daniel Baumann Sat, 14 Feb 2009 00:51:00 +0100 + openerp-server (5.0.0-2-1) unstable; urgency=low * Merging upstream version 5.0.0-2 (Closes: #514920). From acd61c2ffb752b967a882172ac7bec1b0be5c832 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:34 +0300 Subject: [PATCH 34/66] Correcting path of openerp-server in README.Debian (Closes: #520890). bzr revid: p_christ@hol.gr-20090602171534-z4wrsst9afvr4ggd --- debian/openerp-server.README.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 8414958ba41..7ebe7a3e364 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -27,7 +27,7 @@ explanation how to achieve this (you need to execute all commands as root): 4. Initializing the database - # su - postgres -c "/usr/sbin/openerp-server --init=all \ + # su - postgres -c "/usr/bin/openerp-server --init=all \ --config=/etc/openerp-server.conf --stop-after-init" 5. Restarting openerp-server From e28f672d5e7ff23fb7d52d57ade7611562e93930 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:34 +0300 Subject: [PATCH 35/66] Correcting user handling in init script and config file (Closes: #513263, #516348). bzr revid: p_christ@hol.gr-20090602171534-xb617h9hef305nog --- debian/config/openerp-server.conf | 3 +++ debian/openerp-server.init | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/config/openerp-server.conf b/debian/config/openerp-server.conf index 6e998262445..02daca197e9 100644 --- a/debian/config/openerp-server.conf +++ b/debian/config/openerp-server.conf @@ -14,6 +14,9 @@ logfile = /var/log/openerp.log # If empty, it will bind on all interfaces (default empty). interface = localhost +# The unix account on behalf openerp is running. +process_user = openerp + # The TCP port on which the server will listen (default 8069). port = 8069 diff --git a/debian/openerp-server.init b/debian/openerp-server.init index 5a0946e002d..fbf38d0c49d 100644 --- a/debian/openerp-server.init +++ b/debian/openerp-server.init @@ -17,6 +17,8 @@ DAEMON=/usr/bin/openerp-server NAME=openerp-server DESC=openerp-server +USER=openerp + test -x ${DAEMON} || exit 0 set -e From c8520fc5a21917e4b8670c37f0e404d99dd0334a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:34 +0300 Subject: [PATCH 36/66] Setting port to 8070. bzr revid: p_christ@hol.gr-20090602171534-26ftxe661dln9rkj --- debian/config/openerp-server.conf | 2 +- debian/openerp-server.README.Debian | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/config/openerp-server.conf b/debian/config/openerp-server.conf index 02daca197e9..16a30efb3b9 100644 --- a/debian/config/openerp-server.conf +++ b/debian/config/openerp-server.conf @@ -18,7 +18,7 @@ interface = localhost process_user = openerp # The TCP port on which the server will listen (default 8069). -port = 8069 +port = 8070 # Enable debug mode (default False). debug_mode = False diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 7ebe7a3e364..2e05f6d1a28 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -40,8 +40,8 @@ Now, you're finish. Please be aware of the following things: - User: admin; password: admin - User: demo; password; demo - * openerp-server listens by default on port 8069. If you need to change this, - edit /etc/openerp-server.conf and replace 'port = 8069' with + * openerp-server listens by default on port 8070. If you need to change this, + edit /etc/openerp-server.conf and replace 'port = 8070' with 'port = '. * openerp-server in the upstreams configuration listens by default to *all* From 261d99016f971ce68ee76d86e69c2b861c4ddda3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:35 +0300 Subject: [PATCH 37/66] Also mentioning debug_mode and price_accuracy in config file (Closes: #513264). bzr revid: p_christ@hol.gr-20090602171535-7xvn465atbmhja6l --- debian/config/openerp-server.conf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/config/openerp-server.conf b/debian/config/openerp-server.conf index 16a30efb3b9..b6891d2646a 100644 --- a/debian/config/openerp-server.conf +++ b/debian/config/openerp-server.conf @@ -3,6 +3,7 @@ [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 @@ -10,13 +11,13 @@ pidfile = /var/run/openerp.pid # The file where the server log will be stored (default False). logfile = /var/log/openerp.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 unix account on behalf openerp is running. -process_user = openerp - # The TCP port on which the server will listen (default 8069). port = 8070 @@ -49,3 +50,6 @@ db_host = # Specify the database port (default None). db_port = 5432 + +# Specify the price accuracy. +#price_accuracy = From 81d7a39aa39f4eb33f18482266acaa9f65607598 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:35 +0300 Subject: [PATCH 38/66] Using correct rfc-2822 date formats in changelog. bzr revid: p_christ@hol.gr-20090602171535-1bwwubs5wohp84nl --- debian/changelog | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9bf2aa9869..83438114d9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,7 @@ openerp-server (5.0.0-1) unstable; urgency=low * Merging upstream version 5.0.0. - -- Daniel Baumann Sat, 7 Feb 2009 13:33:00 +0100 + -- Daniel Baumann Sat, 07 Feb 2009 13:33:00 +0100 openerp-server (5.0.0~rc3-1) unstable; urgency=low @@ -30,7 +30,7 @@ openerp-server (5.0.0~rc3-1) unstable; urgency=low * Updating python-openssl depends. * Updating lintian overrides. - -- Daniel Baumann Fri, 9 Jan 2009 18:31:00 -0500 + -- Daniel Baumann Fri, 09 Jan 2009 18:31:00 -0500 openerp-server (5.0.0~rc2-1) unstable; urgency=low @@ -72,13 +72,13 @@ openerp-server (5.0.0~alpha-3) unstable; urgency=low * Dropping tinyerp-server transitional package, this allows to have both packages available in unstable. - -- Daniel Baumann Sun, 7 Dec 2008 20:13:00 +0100 + -- Daniel Baumann Sun, 07 Dec 2008 20:13:00 +0100 openerp-server (5.0.0~alpha-2) experimental; urgency=low * Renaming tinyerp-server to new upstream openerp-server name. - -- Daniel Baumann Sun, 9 Nov 2008 18:59:00 +0100 + -- Daniel Baumann Sun, 09 Nov 2008 18:59:00 +0100 tinyerp-server (5.0.0~alpha-1) experimental; urgency=low @@ -103,7 +103,7 @@ tinyerp-server (5.0.0~alpha-1) experimental; urgency=low openerp-server. * Updating copyright file to current upstream. - -- Daniel Baumann Sun, 9 Nov 2008 15:52:00 +0100 + -- Daniel Baumann Sun, 09 Nov 2008 15:52:00 +0100 tinyerp-server (4.2.3.4-3) unstable; urgency=high @@ -139,14 +139,14 @@ tinyerp-server (4.2.3.4-1) unstable; urgency=low * Adding patch from Brian DeRocher to fix sql syntax in migrate script (Closes: #467517). - -- Daniel Baumann Sun, 9 Nov 2008 09:11:00 +0100 + -- Daniel Baumann Sun, 09 Nov 2008 09:11:00 +0100 tinyerp-server (4.2.2-2) unstable; urgency=medium * Readding depends to python-psycopg (Closes: #463079, #493374). * Adding depends to python-tz (Closes: #482359). - -- Daniel Baumann Sun, 3 Aug 2008 00:20:00 +0200 + -- Daniel Baumann Sun, 03 Aug 2008 00:20:00 +0200 tinyerp-server (4.2.2-1) unstable; urgency=low @@ -189,7 +189,7 @@ tinyerp-server (4.0.3-2) unstable; urgency=low * Check for existence of deluser in postrm (Closes: #431532). - -- Daniel Baumann Tue, 3 Jul 2007 11:01:00 +0200 + -- Daniel Baumann Tue, 03 Jul 2007 11:01:00 +0200 tinyerp-server (4.0.3-1) unstable; urgency=low @@ -199,7 +199,7 @@ tinyerp-server (4.0.3-1) unstable; urgency=low thanks to Gerfried Fuchs . * Added lsb header to init script. - -- Daniel Baumann Fri, 1 Jun 2007 11:59:00 +0200 + -- Daniel Baumann Fri, 01 Jun 2007 11:59:00 +0200 tinyerp-server (4.0.2-3) unstable; urgency=low @@ -211,7 +211,7 @@ tinyerp-server (4.0.2-2) unstable; urgency=low * Setting maintainer to Jean-Marc. - -- Daniel Baumann Wed, 7 Feb 2007 13:41:00 +0100 + -- Daniel Baumann Wed, 07 Feb 2007 13:41:00 +0100 tinyerp-server (4.0.2-1) unstable; urgency=low @@ -232,19 +232,19 @@ tinyerp-server (4.0.0-1) unstable; urgency=low * New upstream release. * Added patch to fix a typo in setup.py. - -- Daniel Baumann Tue, 5 Dec 2006 17:43:00 +0100 + -- Daniel Baumann Tue, 05 Dec 2006 17:43:00 +0100 tinyerp-server (4.0.0~rc1-2) unstable; urgency=low * Cleaned up build-depends. - -- Daniel Baumann Tue, 5 Dec 2006 13:19:00 +0100 + -- Daniel Baumann Tue, 05 Dec 2006 13:19:00 +0100 tinyerp-server (4.0.0~rc1-1) unstable; urgency=low * New upstream release. - -- Daniel Baumann Tue, 5 Dec 2006 12:57:00 +0100 + -- Daniel Baumann Tue, 05 Dec 2006 12:57:00 +0100 tinyerp-server (3.5.0-1) experimental; urgency=low @@ -268,13 +268,13 @@ tinyerp-server (3.3.0-1) unstable; urgency=low * Updated README.Debian (Closes: #352322, #360222, #360223). * Set to architecture to all (Closes: #356962). - -- Daniel Baumann Sun, 4 Jun 2006 00:50:00 +0100 + -- Daniel Baumann Sun, 04 Jun 2006 00:50:00 +0100 tinyerp-server (3.2.1-1) unstable; urgency=low * New upstream release. - -- Daniel Baumann Thu, 2 Feb 2006 09:44:00 +0100 + -- Daniel Baumann Thu, 02 Feb 2006 09:44:00 +0100 tinyerp-server (3.2.0-1) unstable; urgency=low From 397ec7ff07efa37d6cb9b0d6ebbdb1c2da5f5cca Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:35 +0300 Subject: [PATCH 39/66] Rediffing shebang.patch. bzr revid: p_christ@hol.gr-20090602171535-wufeni69bysy9otf --- debian/patches/03-shebang.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/03-shebang.patch b/debian/patches/03-shebang.patch index 7add479b084..68818e1f733 100644 --- a/debian/patches/03-shebang.patch +++ b/debian/patches/03-shebang.patch @@ -2,11 +2,11 @@ Author: Daniel Baumann Description: Correcting shebang. diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py ---- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:06:22.000000000 +0000 -+++ openerp-server/bin/addons/document/ftpserver/ftpserver.py 2008-12-16 11:28:19.000000000 +0000 +--- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2009-05-30 10:14:37.000000000 +0000 ++++ openerp-server/bin/addons/document/ftpserver/ftpserver.py 2009-05-30 11:02:00.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python + # -*- encoding: utf-8 -*- # ftpserver.py # - # pyftpdlib is released under the MIT license, reproduced below: From 4282fc6dda9d45d199b1f26892651be8d24514e2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:35 +0300 Subject: [PATCH 40/66] Releasing debian version 5.0.1-0-1. bzr revid: p_christ@hol.gr-20090602171535-zb1oaab1rjyhkp53 --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 83438114d9f..27cd6862afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +openerp-server (5.0.1-0-1) unstable; urgency=low + + * Merging upstream version 5.0.1-0. + * Correcting path of openerp-server in README.Debian (Closes: + #520890). + * Correcting user handling in init script and config file (Closes: + #513263, #516348). + * Setting port to 8070. + * Also mentioning debug_mode and price_accuracy in config file + (Closes: #513264). + * Using correct rfc-2822 date formats in changelog. + * Rediffing shebang.patch. + + -- Daniel Baumann Sat, 30 May 2009 12:53:39 +0200 + openerp-server (5.0.0-3-1) unstable; urgency=low * Merging upstream version 5.0.0-3. From 9faee959a6edaccb8c67c82fcd45df259508ae3e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Jun 2009 20:15:36 +0300 Subject: [PATCH 41/66] Updating standards to 3.8.1. bzr revid: p_christ@hol.gr-20090602171536-n42u8xwrbzam4f8f --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 484bdf8714b..062da5bbff2 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), quilt, python-dev Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git Vcs-Git: git://git.debian.net/git/debian/openerp-server.git From 22440b06d2610b1c333a5e40df521ced98684b6f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:04 +0300 Subject: [PATCH 42/66] Rediffing autobuild.patch (Closes: #538625). bzr revid: p_christ@hol.gr-20090824180204-fq3ido74jysmx05n --- debian/patches/01-autobuild.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/01-autobuild.patch b/debian/patches/01-autobuild.patch index eb1fb1e2d79..abdd197247b 100644 --- a/debian/patches/01-autobuild.patch +++ b/debian/patches/01-autobuild.patch @@ -2,14 +2,14 @@ Author: Daniel Baumann Description: Disable modules check to make it buildable without X11. diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py ---- openerp-server.orig/setup.py 2008-11-03 21:33:56.000000000 +0000 -+++ openerp-server/setup.py 2008-11-09 09:00:02.000000000 +0000 -@@ -133,7 +133,7 @@ def data_files(): - files.append(('.', [('bin/import_xml.rng')])) +--- openerp-server.orig/setup.py 2009-06-08 15:51:20.000000000 +0000 ++++ openerp-server/setup.py 2009-07-26 10:27:49.000000000 +0000 +@@ -121,7 +121,7 @@ def data_files(): + return files -check_modules() +#check_modules() - # create startup script - start_script = \ + f = file('openerp-server','w') + start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """ From cd260668ca9be27016b095dd6d6a010e11c348e2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:04 +0300 Subject: [PATCH 43/66] Upgrading package to standards version 3.8.2. bzr revid: p_christ@hol.gr-20090824180204-xbq5r88uk92grc1t --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 062da5bbff2..410967e2873 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), quilt, python-dev Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git Vcs-Git: git://git.debian.net/git/debian/openerp-server.git From a6b591974ac175d8151b2ca738f1cf3c5217efc4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:04 +0300 Subject: [PATCH 44/66] Managing setup of unprivileged user account with debconf. bzr revid: p_christ@hol.gr-20090824180204-3xu6rhc4qvilbnrl --- debian/control | 2 +- debian/openerp-server.config | 10 ++++++++ debian/openerp-server.examples | 1 + debian/openerp-server.postinst | 28 ++++++++++++++++------ debian/openerp-server.postrm | 36 +++++++++++++++++++++++++---- debian/openerp-server.preseed | 5 ++++ debian/openerp-server.templates | 9 ++++++++ debian/po/POTFILES.in | 1 + debian/po/cs.po | 39 +++++++++++++++++++++++++++++++ debian/po/de.po | 39 +++++++++++++++++++++++++++++++ debian/po/es.po | 40 ++++++++++++++++++++++++++++++++ debian/po/fi.po | 40 ++++++++++++++++++++++++++++++++ debian/po/fr.po | 37 +++++++++++++++++++++++++++++ debian/po/gl.po | 40 ++++++++++++++++++++++++++++++++ debian/po/it.po | 39 +++++++++++++++++++++++++++++++ debian/po/ja.po | 37 +++++++++++++++++++++++++++++ debian/po/pt.po | 39 +++++++++++++++++++++++++++++++ debian/po/ru.po | 41 +++++++++++++++++++++++++++++++++ debian/po/sv.po | 39 +++++++++++++++++++++++++++++++ debian/po/templates.pot | 37 +++++++++++++++++++++++++++++ debian/po/zh_CN.po | 37 +++++++++++++++++++++++++++++ debian/rules | 20 +++++++++++++++- 22 files changed, 602 insertions(+), 14 deletions(-) create mode 100644 debian/openerp-server.config create mode 100644 debian/openerp-server.examples create mode 100644 debian/openerp-server.preseed create mode 100644 debian/openerp-server.templates create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/cs.po create mode 100644 debian/po/de.po create mode 100644 debian/po/es.po create mode 100644 debian/po/fi.po create mode 100644 debian/po/fr.po create mode 100644 debian/po/gl.po create mode 100644 debian/po/it.po create mode 100644 debian/po/ja.po create mode 100644 debian/po/pt.po create mode 100644 debian/po/ru.po create mode 100644 debian/po/sv.po create mode 100644 debian/po/templates.pot create mode 100644 debian/po/zh_CN.po diff --git a/debian/control b/debian/control index 410967e2873..cfce70f261b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openerp-server Section: net Priority: optional Maintainer: Daniel Baumann -Build-Depends: debhelper (>= 7), quilt, python-dev +Build-Depends: debhelper (>= 7), quilt, po-debconf, python-dev Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 Standards-Version: 3.8.2 Homepage: http://www.openerp.com/ diff --git a/debian/openerp-server.config b/debian/openerp-server.config new file mode 100644 index 00000000000..cf081ab3861 --- /dev/null +++ b/debian/openerp-server.config @@ -0,0 +1,10 @@ +#!/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.examples b/debian/openerp-server.examples new file mode 100644 index 00000000000..c7f075ec127 --- /dev/null +++ b/debian/openerp-server.examples @@ -0,0 +1 @@ +debian/openerp-server.preseed diff --git a/debian/openerp-server.postinst b/debian/openerp-server.postinst index a7854521e5b..0a4047d7ef8 100644 --- a/debian/openerp-server.postinst +++ b/debian/openerp-server.postinst @@ -2,25 +2,39 @@ set -e -USER="openerp" +. /usr/share/debconf/confmodule + CONFFILE="/etc/openerp-server.conf" LOGFILE="/var/log/openerp.log" case "${1}" in configure) - # Creating system user - adduser --no-create-home --quiet --system ${USER} + 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 'OpenERP server' --group ${_USERNAME} + else + echo "OpenERP user (${_USERNAME}) already exists, doing nothing." + fi + + sed -i -e "s|^process_user.*$|process_user = ${_USERNAME}|" ${CONFFILE} # Creating log file touch ${LOGFILE} - chown ${USER}:adm ${LOGFILE} + chown ${_USERNAME}:adm ${LOGFILE} chmod 0640 ${LOGFILE} - # Setting ownership - chown ${USER} /usr/lib/openerp-server/addons -R + # Setting ownership and permissions + chown ${_USERNAME} /usr/lib/openerp-server/addons -R chmod 0640 ${CONFFILE} - chown ${USER} ${CONFFILE} + chown ${_USERNAME}:${_USERNAME} ${CONFFILE} echo echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm index 820cd0c3665..a98dbe9dfd8 100644 --- a/debian/openerp-server.postrm +++ b/debian/openerp-server.postrm @@ -2,18 +2,44 @@ set -e -USER="openerp" +if [ -e /usr/share/debconf/confmodule ] +then + _DEBCONF="true" + + . /usr/share/debconf/confmodule +fi case "${1}" in - purge) - # Removing system user + remove) + if [ "${_DEBCONF}" = "true" ] + then + db_version 2.0 + + db_get openerp-server/username + _USERNAME="${RET}" + + db_stop + fi + + if [ -z "${_USERNAME}" ] + then + _USERNAME="openerp" + fi + + _GROUPNAME="${_USERNAME}" + if [ -x /usr/sbin/deluser ] then - deluser --quiet --system ${USER} + deluser --quiet --system ${_USERNAME} + fi + + if [ -x /usr/sbin/delgroup ] + then + delgroup --quiet --system --only-if-empty ${_GROUPNAME} || true fi ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/openerp-server.preseed b/debian/openerp-server.preseed new file mode 100644 index 00000000000..66d1a4ab95d --- /dev/null +++ b/debian/openerp-server.preseed @@ -0,0 +1,5 @@ +################################################################################ +## openerp-server + +#openerp-server openerp-server/username string openerp +################################################################################ diff --git a/debian/openerp-server.templates b/debian/openerp-server.templates new file mode 100644 index 00000000000..c161b8c73f4 --- /dev/null +++ b/debian/openerp-server.templates @@ -0,0 +1,9 @@ +Template: openerp-server/username +Type: string +Default: openerp +_Description: Dedicated system account for the OpenERP server: + The OpenERP 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/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 00000000000..eb66b9be4c0 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] openerp-server.templates diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 00000000000..d311388ccc0 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,39 @@ +# Czech translation of openerp-server debconf templates. +# Copyright (C) 2009 Vítězslav Kotrla +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-05-30 08:24+0000\n" +"PO-Revision-Date: 2009-06-21 08:20+0200\n" +"Last-Translator: Vítězslav Kotrla \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Vyhrazený systémový účet, pod kterým bude běžet OpenERP server:" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"Pokud by byl OpenERP server spuštěn se superuživatelskými oprávněními, mohlo by dojít " +"ke kompromitaci zabezpečení systému. Proto musí OpenERP server pro svoji činnost používat " +"vyhrazený neprivilegovaný účet." + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "Please choose that account's username." +msgstr "Zvolte prosím název totoho účtu." diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 00000000000..74edd5f094b --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,39 @@ +# German translation of openerp-server debconf templates. +# Copyright (C) 2009 Kai Wasserbäch +# Copyright (C) 2009 Helge Kreutzmann +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-04-06 19:01+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Eigenes Systemkonto für den OpenERP-Server:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"Der OpenERP-Server muss ein eigenes Konto für den Betrieb verwenden, um die " +"Sicherheit des Systems nicht durch das Betreiben mit Superuser-Rechten zu " +"kompromittieren." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Bitte wählen Sie den Benutzernamen dieses Kontos." diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 00000000000..ea83b6f5e88 --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,40 @@ +# Spanish translation of openerp-server debconf templates. +# Copyright (C) 2009 Software in the Public Interest +# 2009 Fernando González de Requena +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-03-30 22:35+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Cuenta del sistema dedicada para el servidor OpenERP:" + +#. Type: string +#. Description +#: ../openerp-server:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"El servidor de OpenERP debe utilizar una cuenta dedicada para su funcionamiento, " +"de tal modo que la seguridad del sistema no se vea comprometida por su " +"utilización con privilegios de administración." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Elija un nombre de usuario para esa cuenta." diff --git a/debian/po/fi.po b/debian/po/fi.po new file mode 100644 index 00000000000..f2b056ae85f --- /dev/null +++ b/debian/po/fi.po @@ -0,0 +1,40 @@ +# Finnish translation of openerp-server debconf templates. +# Copyright (C) 2009 Esko Arajärvi +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-04-07 22:19+0300\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Dedikoitu järjestelmätunnus OpenERP-taustaohjelman ajamiseen:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"OpenERP-palvelimen tulee käyttää dedikoitua tunnusta toiminnoissaan, jotta " +"järjestelmän turvallisuus ei vaarannu kuten käytettäessä " +"pääkäyttäjäoikeuksia." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Valitse kyseisen tunnuksen nimi." diff --git a/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 00000000000..132ab88ee99 --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,37 @@ +# French translation of openerp-server debconf templates. +# Copyright (C) 2009 Steve Petruzzello +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-03-26 01:12+0100\n" +"Last-Translator: Steve Petruzzello \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Identifiant dédié pour le serveur OpenERP:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"Le serveur OpenERP doit être exécuté avec un identifiant spécifique, différent " +"du superutilisateur, afin de ne pas compromettre la sécurité du système." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Veuillez choisir cet identifiant." diff --git a/debian/po/gl.po b/debian/po/gl.po new file mode 100644 index 00000000000..98267a3e746 --- /dev/null +++ b/debian/po/gl.po @@ -0,0 +1,40 @@ +# Galizian translation of openerp-server debconf templates. +# Copyright (C) 2009 Marce Villarino +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-04-15 21:32+0200\n" +"Last-Translator: marce villarino \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Conta de usuario do sistema adicada ao servidor OpenERP:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"O servidor OpenERP debe empregar unha conta adicada a el para que a " +"seguridade do sistema non se poña en perigo ao executalo con privilexios de " +"administrador." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Escolla o nome de usuario desa conta." diff --git a/debian/po/it.po b/debian/po/it.po new file mode 100644 index 00000000000..0a19612e16f --- /dev/null +++ b/debian/po/it.po @@ -0,0 +1,39 @@ +# Italian translation of openerp-server debconf templates. +# Copyright (C) 2009 Vincenzo Campanella +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-03-26 08:52+0100\n" +"Last-Translator: Vincenzo Campanella \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Account di sistema dedicato per il server di OpenERP:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"Il server OpenERP deve utilizzare un account dedicato per eseguire le proprie " +"operazioni, in modo che la sicurezza del sistema non rischi di essere compromessa " +"eseguendolo con privilegi di superutente." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Scegliere il nome utente di tale account." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 00000000000..2f1abd4b56b --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,37 @@ +# Japanese translation of openerp-server debconf templates. +# Copyright (C) 2009 Hideki Yamane +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-04-09 19:20+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openerp-servera.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "OpenERP デーモン専用のシステムアカウント:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"OpenERP サーバはその動作について専用のアカウントを使うようになっているため、管理" +"者特権で動作していてもシステムのセキュリティは侵害されません。" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "アカウントのユーザ名を選んでください。" diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 00000000000..12961877e75 --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,39 @@ +# Portuguese translation of openerp-server debconf templates. +# Copyright (C) 2009 Américo Monteiro +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-03-26 19:12+0000\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: string +#. Description +#: ../openerp-servera.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Conta dedicada do sistema para o servidor OpenERP:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"O servidor OpenERP tem que usar uma conta dedicada para as suas operações, isto " +"para que a segurança do sistema não seja comprometida ao corrê-lo com " +"privilégios de superutilizador." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Por favor escolha o nome dessa conta." diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 00000000000..55e29d26d81 --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,41 @@ +# German translation of openerp-server debconf templates. +# Copyright (C) 2009 Sergey Alyoshin +# Copyright (C) 2009 Yuri Kozlov +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server 5.0.1-0-2\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-04-08 21:08+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Специально выделенная системная учётная запись для OpenERP службы:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"Для улучшения безопасности системы OpenERP сервер должен использовать специально " +"выделенную учётную запись, а не запускаться с правами суперпользователя." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Укажите имя такой учётной записи." diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 00000000000..845d9d8c62a --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,39 @@ +# Swedish translation of openerp-server debconf templates. +# Copyright (C) 2009 Martin Bagge +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server\n" +"Report-Msgid-Bugs-To: openerp-serverpackages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-04-07 18:36+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: Swedish\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "Dedikerat systemkonto för OpenERP server:" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"OpenERP servern måste ha ett dedikerat konto för att fungera på ett säkert sätt, " +"att använda privilegier från en superanvändare är inte säkert." + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "Ange kontots användarnamn." diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 00000000000..6f92489ff63 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "" diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po new file mode 100644 index 00000000000..49cc85f88dd --- /dev/null +++ b/debian/po/zh_CN.po @@ -0,0 +1,37 @@ +# Simplified Chinese translation of openerp-server debconf templates. +# Copyright (C) 2009 Deng Xiyue +# This file is distributed under the same license as the openerp-server package. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-server\n" +"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" +"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"PO-Revision-Date: 2009-03-26 16:48+0800\n" +"Last-Translator: Deng Xiyue \n" +"Language-Team: Debian Chinese GB \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Dedicated system account for the OpenERP server:" +msgstr "指定操作 OpenERP 守护进程的专用系统帐户：" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "" +"The OpenERP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"OpenERP 服务器必须使用一个专用的账户来进行操作，这样就不会因为使用超级用户权限运" +"行而破坏系统的安全。" + +#. Type: string +#. Description +#: ../openerp-server.templates:2001 +msgid "Please choose that account's username." +msgstr "请选择账户的用户名。" diff --git a/debian/rules b/debian/rules index 83d9bfa54fe..d974a63b2d1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,22 @@ #!/usr/bin/make -f +SHELL := sh -e + include /usr/share/quilt/quilt.make +update: + # Needs: shell-helper + + cd debian; \ + debconf-create-preseed *.config; \ + + for FILE in debian/*.preseed; \ + do \ + grep -v preseed $$FILE > $$FILE.tmp; \ + mv $$FILE.tmp $$FILE; \ + echo $$FILE >> debian/`basename $$FILE .preseed`.examples; \ + done + clean: clean-patched unpatch clean-patched: patch dh_testdir @@ -9,10 +24,11 @@ clean-patched: patch rm -f build-stamp python setup.py clean - rm -rf build openerp-server -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f + debconf-updatepo + dh_clean build: @@ -45,8 +61,10 @@ binary-indep: install dh_testroot dh_installchangelogs doc/Changelog dh_installdocs + dh_installexamples dh_install dh_installinit --update-rcd-params='defaults 21' + dh_installdebconf dh_lintian dh_link dh_compress From 3bba87bd020c9ce1b757bbd485bdf0930762caca Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:04 +0300 Subject: [PATCH 45/66] Using more common directory name to store local debian additions. bzr revid: p_christ@hol.gr-20090824180204-1efkwr1t553162a6 --- debian/{config => local}/openerp-server.conf | 0 debian/openerp-server.install | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename debian/{config => local}/openerp-server.conf (100%) diff --git a/debian/config/openerp-server.conf b/debian/local/openerp-server.conf similarity index 100% rename from debian/config/openerp-server.conf rename to debian/local/openerp-server.conf diff --git a/debian/openerp-server.install b/debian/openerp-server.install index 28c56bcbac8..ccfbbb27fd6 100644 --- a/debian/openerp-server.install +++ b/debian/openerp-server.install @@ -1 +1 @@ -debian/config/* /etc/ +debian/local/openerp-server.conf /etc From 670aa160d5c4a5986f4c47e63f906b49c448098b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:05 +0300 Subject: [PATCH 46/66] Updating README.Debian to reflect that the database has to be initialized through the client (Closes: #518675). bzr revid: p_christ@hol.gr-20090824180205-shx109r7qfzl3rgo --- debian/openerp-server.README.Debian | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 2e05f6d1a28..630c0fc9e7c 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -13,27 +13,23 @@ explanation how to achieve this (you need to execute all commands as root): the above syvinit script could also be named postgresql-VERSION (whereas 'VERSION' needs to be replace with a version number). - 1. Creating the database + 1. Creating the database user - # su - postgres -c "createdb -q --encoding=UNICODE openerp" - - 2. Creating the database user - - # su - postgres -c "createuser -q --createdb --adduser openerp" + # su - postgres -c "createuser -q --createdb --no-createrole --pwprompt openerp" Note: If you want to run the database as another user than 'openerp', you need to replace 'openerp' above with the user you want instead, and you need to adjust 'db_user = openerp' in /etc/openerp-server.conf too. - 4. Initializing the database - - # su - postgres -c "/usr/bin/openerp-server --init=all \ - --config=/etc/openerp-server.conf --stop-after-init" - - 5. Restarting openerp-server + 3. Restarting openerp-server # /etc/init.d/openerp-server restart + + 4. Initializing the database + + Now you can connect with OpenERP client to the database and initialize it. + Now, you're finish. Please be aware of the following things: * openerp-server has by default two accounts: From d5edde2b83aa416d8e7a2e65f14d2a2926d2f1d0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:05 +0300 Subject: [PATCH 47/66] Removing package leftovers in postrm script. bzr revid: p_christ@hol.gr-20090824180205-u9qy3pz7886gy9b4 --- debian/openerp-server.postrm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm index a98dbe9dfd8..e9effaa8351 100644 --- a/debian/openerp-server.postrm +++ b/debian/openerp-server.postrm @@ -37,6 +37,10 @@ case "${1}" in 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 + rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server ;; purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) From 5b9fe91f0be5557f708afaf130c066aebb3dd7f7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:05 +0300 Subject: [PATCH 48/66] Releasing debian version 5.0.2-0-1. bzr revid: p_christ@hol.gr-20090824180205-t082mbn73djjfzzz --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 27cd6862afa..46bbd245dd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +openerp-server (5.0.2-0-1) unstable; urgency=low + + * Updating standards to 3.8.1. + * Rediffing autobuild.patch (Closes: #538625). + * Upgrading package to standards version 3.8.2. + * Managing setup of unprivileged user account with debconf. + * Using more common directory name to store local debian additions. + * Updating README.Debian to reflect that the database has to be + initialized through the client (Closes: #518675). + * Removing package leftovers in postrm script. + * Merging upstream version 5.0.2-0. + + -- Daniel Baumann Thu, 13 Aug 2009 11:24:59 +0200 + openerp-server (5.0.1-0-1) unstable; urgency=low * Merging upstream version 5.0.1-0. From c0b2af2bd6c135fb4a49dbf4e96010d7218b5297 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:05 +0300 Subject: [PATCH 49/66] Releasing debian version 5.0.2-0-2. bzr revid: p_christ@hol.gr-20090824180205-j6fy9s9gi1bfmhdz --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 46bbd245dd9..547d5b3c533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openerp-server (5.0.2-0-2) unstable; urgency=high + + * Adding patch from Panos Christeas to forbid RPC + calls without credentials. All versions of openerp-server affected. + + -- Daniel Baumann Thu, 13 Aug 2009 14:45:17 +0200 + openerp-server (5.0.2-0-1) unstable; urgency=low * Updating standards to 3.8.1. From 8cf1c3e6af527b667c9abb7db22cfed9ba367607 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:06 +0300 Subject: [PATCH 50/66] Wrapping and sorting depends. bzr revid: p_christ@hol.gr-20090824180206-a0ecfvfbl88oiods --- debian/control | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index cfce70f261b..b53c821f5db 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: openerp-server Section: net Priority: optional Maintainer: Daniel Baumann -Build-Depends: debhelper (>= 7), quilt, po-debconf, python-dev -Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 +Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt +Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2, python-xml, Standards-Version: 3.8.2 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git @@ -12,10 +12,15 @@ Vcs-Git: git://git.debian.net/git/debian/openerp-server.git Package: openerp-server Section: net Architecture: all -Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg2, python-reportlab, python-pychart, python-pydot, python-tz +Depends: + ${misc:Depends}, adduser, python, python-libxslt1, python-lxml, + python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz, + python-xml Conflicts: tinyerp-server Replaces: tinyerp-server -Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-openssl, python-pyparsing +Recommends: + graphviz, ghostscript, postgresql, postgresql-client, python-imaging, + python-matplotlib, python-openssl, python-pyparsing Suggests: openerp-client Description: Enterprise Resource Management (server) OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main From dd229df98bba7899ab5d376bc9633e78c90832f6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:06 +0300 Subject: [PATCH 51/66] Correcting spelling of Open ERP. bzr revid: p_christ@hol.gr-20090824180206-k50l99vswrgmbcty --- debian/control | 4 ++-- debian/openerp-server.README.Debian | 4 ++-- debian/openerp-server.init | 2 +- debian/openerp-server.postinst | 6 +++--- debian/openerp-server.templates | 4 ++-- debian/po/cs.po | 10 +++++----- debian/po/de.po | 8 ++++---- debian/po/es.po | 8 ++++---- debian/po/fi.po | 8 ++++---- debian/po/fr.po | 8 ++++---- debian/po/gl.po | 8 ++++---- debian/po/it.po | 8 ++++---- debian/po/ja.po | 8 ++++---- debian/po/pt.po | 8 ++++---- debian/po/ru.po | 8 ++++---- debian/po/sv.po | 8 ++++---- debian/po/templates.pot | 4 ++-- debian/po/zh_CN.po | 8 ++++---- 18 files changed, 61 insertions(+), 61 deletions(-) diff --git a/debian/control b/debian/control index b53c821f5db..6e6bf7dddc4 100644 --- a/debian/control +++ b/debian/control @@ -23,12 +23,12 @@ Recommends: python-matplotlib, python-openssl, python-pyparsing Suggests: openerp-client Description: Enterprise Resource Management (server) - OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main + Open ERP, 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 OpenERP server, install openerp-client package for + This package contains the Open ERP server, install openerp-client package for the client. diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 630c0fc9e7c..39dede87780 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -1,7 +1,7 @@ openerp-server for Debian ------------------------- -OpenERP uses a PostgreSQL database to store its data. With the first generation +Open ERP uses a PostgreSQL database to store its data. With the first generation of packages, you have to setup this database manually. Here is a short explanation how to achieve this (you need to execute all commands as root): @@ -28,7 +28,7 @@ explanation how to achieve this (you need to execute all commands as root): 4. Initializing the database - Now you can connect with OpenERP client to the database and initialize it. + Now you can connect with Open ERP client to the database and initialize it. Now, you're finish. Please be aware of the following things: diff --git a/debian/openerp-server.init b/debian/openerp-server.init index fbf38d0c49d..e981d2cffe8 100644 --- a/debian/openerp-server.init +++ b/debian/openerp-server.init @@ -9,7 +9,7 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Enterprise Resource Management software -# Description: OpenERP is a complete ERP and CRM software. +# Description: Open ERP is a complete ERP and CRM software. ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin diff --git a/debian/openerp-server.postinst b/debian/openerp-server.postinst index 0a4047d7ef8..d4dea03812a 100644 --- a/debian/openerp-server.postinst +++ b/debian/openerp-server.postinst @@ -18,9 +18,9 @@ case "${1}" in if ! getent passwd | grep -q "^${_USERNAME}" then - adduser --system --no-create-home --quiet --gecos 'OpenERP server' --group ${_USERNAME} + adduser --system --no-create-home --quiet --gecos 'Open ERP server' --group ${_USERNAME} else - echo "OpenERP user (${_USERNAME}) already exists, doing nothing." + echo "Open ERP user (${_USERNAME}) already exists, doing nothing." fi sed -i -e "s|^process_user.*$|process_user = ${_USERNAME}|" ${CONFFILE} @@ -38,7 +38,7 @@ case "${1}" in echo echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" - echo "* OpenERP uses a PostgreSQL database to store its data. With the first *" + 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 "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" diff --git a/debian/openerp-server.templates b/debian/openerp-server.templates index c161b8c73f4..985bd24abd9 100644 --- a/debian/openerp-server.templates +++ b/debian/openerp-server.templates @@ -1,8 +1,8 @@ Template: openerp-server/username Type: string Default: openerp -_Description: Dedicated system account for the OpenERP server: - The OpenERP server must use a dedicated account for its operation so that +_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. . diff --git a/debian/po/cs.po b/debian/po/cs.po index d311388ccc0..02c16082449 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -18,18 +18,18 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:1001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Vyhrazený systémový účet, pod kterým bude běžet OpenERP server:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Vyhrazený systémový účet, pod kterým bude běžet Open ERP server:" #. Type: string #. Description #: ../openerp-server.templates:1001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"Pokud by byl OpenERP server spuštěn se superuživatelskými oprávněními, mohlo by dojít " -"ke kompromitaci zabezpečení systému. Proto musí OpenERP server pro svoji činnost používat " +"Pokud by byl Open ERP server spuštěn se superuživatelskými oprávněními, mohlo by dojít " +"ke kompromitaci zabezpečení systému. Proto musí Open ERP server pro svoji činnost používat " "vyhrazený neprivilegovaný účet." #. Type: string diff --git a/debian/po/de.po b/debian/po/de.po index 74edd5f094b..9b41a553763 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -18,17 +18,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Eigenes Systemkonto für den OpenERP-Server:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Eigenes Systemkonto für den Open ERP-Server:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"Der OpenERP-Server muss ein eigenes Konto für den Betrieb verwenden, um die " +"Der Open ERP-Server muss ein eigenes Konto für den Betrieb verwenden, um die " "Sicherheit des Systems nicht durch das Betreiben mit Superuser-Rechten zu " "kompromittieren." diff --git a/debian/po/es.po b/debian/po/es.po index ea83b6f5e88..3dfaeddae26 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -19,17 +19,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Cuenta del sistema dedicada para el servidor OpenERP:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Cuenta del sistema dedicada para el servidor Open ERP:" #. Type: string #. Description #: ../openerp-server:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"El servidor de OpenERP debe utilizar una cuenta dedicada para su funcionamiento, " +"El servidor de Open ERP debe utilizar una cuenta dedicada para su funcionamiento, " "de tal modo que la seguridad del sistema no se vea comprometida por su " "utilización con privilegios de administración." diff --git a/debian/po/fi.po b/debian/po/fi.po index f2b056ae85f..e85c1df517c 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -19,17 +19,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Dedikoitu järjestelmätunnus OpenERP-taustaohjelman ajamiseen:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Dedikoitu järjestelmätunnus Open ERP-taustaohjelman ajamiseen:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"OpenERP-palvelimen tulee käyttää dedikoitua tunnusta toiminnoissaan, jotta " +"Open ERP-palvelimen tulee käyttää dedikoitua tunnusta toiminnoissaan, jotta " "järjestelmän turvallisuus ei vaarannu kuten käytettäessä " "pääkäyttäjäoikeuksia." diff --git a/debian/po/fr.po b/debian/po/fr.po index 132ab88ee99..afcbbf34fb8 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -17,17 +17,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Identifiant dédié pour le serveur OpenERP:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Identifiant dédié pour le serveur Open ERP:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"Le serveur OpenERP doit être exécuté avec un identifiant spécifique, différent " +"Le serveur Open ERP doit être exécuté avec un identifiant spécifique, différent " "du superutilisateur, afin de ne pas compromettre la sécurité du système." #. Type: string diff --git a/debian/po/gl.po b/debian/po/gl.po index 98267a3e746..e83c049c07c 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -19,17 +19,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Conta de usuario do sistema adicada ao servidor OpenERP:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Conta de usuario do sistema adicada ao servidor Open ERP:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"O servidor OpenERP debe empregar unha conta adicada a el para que a " +"O servidor Open ERP debe empregar unha conta adicada a el para que a " "seguridade do sistema non se poña en perigo ao executalo con privilexios de " "administrador." diff --git a/debian/po/it.po b/debian/po/it.po index 0a19612e16f..05059caa73f 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -18,17 +18,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Account di sistema dedicato per il server di OpenERP:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Account di sistema dedicato per il server di Open ERP:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"Il server OpenERP deve utilizzare un account dedicato per eseguire le proprie " +"Il server Open ERP deve utilizzare un account dedicato per eseguire le proprie " "operazioni, in modo che la sicurezza del sistema non rischi di essere compromessa " "eseguendolo con privilegi di superutente." diff --git a/debian/po/ja.po b/debian/po/ja.po index 2f1abd4b56b..647c6381a8f 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -17,17 +17,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-servera.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "OpenERP デーモン専用のシステムアカウント:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Open ERP デーモン専用のシステムアカウント:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"OpenERP サーバはその動作について専用のアカウントを使うようになっているため、管理" +"Open ERP サーバはその動作について専用のアカウントを使うようになっているため、管理" "者特権で動作していてもシステムのセキュリティは侵害されません。" #. Type: string diff --git a/debian/po/pt.po b/debian/po/pt.po index 12961877e75..a6d26f7ba26 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -18,17 +18,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-servera.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Conta dedicada do sistema para o servidor OpenERP:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Conta dedicada do sistema para o servidor Open ERP:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"O servidor OpenERP tem que usar uma conta dedicada para as suas operações, isto " +"O servidor Open ERP tem que usar uma conta dedicada para as suas operações, isto " "para que a segurança do sistema não seja comprometida ao corrê-lo com " "privilégios de superutilizador." diff --git a/debian/po/ru.po b/debian/po/ru.po index 55e29d26d81..811f7e31e47 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -21,17 +21,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Специально выделенная системная учётная запись для OpenERP службы:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Специально выделенная системная учётная запись для Open ERP службы:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"Для улучшения безопасности системы OpenERP сервер должен использовать специально " +"Для улучшения безопасности системы Open ERP сервер должен использовать специально " "выделенную учётную запись, а не запускаться с правами суперпользователя." #. Type: string diff --git a/debian/po/sv.po b/debian/po/sv.po index 845d9d8c62a..cb69412b65a 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -19,17 +19,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "Dedikerat systemkonto för OpenERP server:" +msgid "Dedicated system account for the Open ERP server:" +msgstr "Dedikerat systemkonto för Open ERP server:" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"OpenERP servern måste ha ett dedikerat konto för att fungera på ett säkert sätt, " +"Open ERP servern måste ha ett dedikerat konto för att fungera på ett säkert sätt, " "att använda privilegier från en superanvändare är inte säkert." #. Type: string diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 6f92489ff63..68587d7fc22 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -19,14 +19,14 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" +msgid "Dedicated system account for the Open ERP server:" msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index 49cc85f88dd..4ce5a3d4a12 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -17,17 +17,17 @@ msgstr "" #. Type: string #. Description #: ../openerp-server.templates:2001 -msgid "Dedicated system account for the OpenERP server:" -msgstr "指定操作 OpenERP 守护进程的专用系统帐户：" +msgid "Dedicated system account for the Open ERP server:" +msgstr "指定操作 Open ERP 守护进程的专用系统帐户：" #. Type: string #. Description #: ../openerp-server.templates:2001 msgid "" -"The OpenERP server must use a dedicated account for its operation so that the " +"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." msgstr "" -"OpenERP 服务器必须使用一个专用的账户来进行操作，这样就不会因为使用超级用户权限运" +"Open ERP 服务器必须使用一个专用的账户来进行操作，这样就不会因为使用超级用户权限运" "行而破坏系统的安全。" #. Type: string From 65d32958309a831964b00a4c0eb7d04354689eaa Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:06 +0300 Subject: [PATCH 52/66] Updating maintainer field. bzr revid: p_christ@hol.gr-20090824180206-cj5n7nx5zzf9hcdi --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6e6bf7dddc4..5cd92192b8f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: openerp-server Section: net Priority: optional -Maintainer: Daniel Baumann +Maintainer: Debian Open Object Maintainers +Uploaders: Daniel Baumann Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2, python-xml, Standards-Version: 3.8.2 From 0a2fe96a30a1dd59078ea1ec0cb68738fe8af6e7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:07 +0300 Subject: [PATCH 53/66] Updating vcs fields. bzr revid: p_christ@hol.gr-20090824180207-e4e0wlbpsllftko7 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5cd92192b8f..4ca074e7e4c 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2, python-xml, Standards-Version: 3.8.2 Homepage: http://www.openerp.com/ -Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git -Vcs-Git: git://git.debian.net/git/debian/openerp-server.git +Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git +Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git Package: openerp-server Section: net From 443e8dad5bc01f6b1f5ad1a41085a7133aba93c3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:07 +0300 Subject: [PATCH 54/66] Updating to standards version 3.8.3. bzr revid: p_christ@hol.gr-20090824180207-yp85zybd5vf161o5 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4ca074e7e4c..fdf028ed30f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Open Object Maintainers Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2, python-xml, -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git From 900f37591ea326e0a2cddaa0f8ad37cd37503246 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:07 +0300 Subject: [PATCH 55/66] Dropping old depends on python-xml (Closes: #543127). bzr revid: p_christ@hol.gr-20090824180207-ryx2l3rzbhcc783y --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index fdf028ed30f..a7bb7cdea7f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Open Object Maintainers Uploaders: Daniel Baumann Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt -Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2, python-xml, +Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2 Standards-Version: 3.8.3 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git @@ -15,8 +15,7 @@ Section: net Architecture: all Depends: ${misc:Depends}, adduser, python, python-libxslt1, python-lxml, - python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz, - python-xml + python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz Conflicts: tinyerp-server Replaces: tinyerp-server Recommends: From 2fa96fb5f452b57d99dbe04df6d50b42ba90420f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:07 +0300 Subject: [PATCH 56/66] Adding maintainer homepage field to control. bzr revid: p_christ@hol.gr-20090824180207-ulohegadc4xkitmo --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index a7bb7cdea7f..717bde163d5 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Standards-Version: 3.8.3 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git +XS-Maintainer-Homepage: http://open-object.debian-maintainers.org/ Package: openerp-server Section: net From e9e016e1975ecad9ce90b8768d009a18177845f0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:08 +0300 Subject: [PATCH 57/66] Marking maintainer homepage field to be also included in binary packages and changelog. bzr revid: p_christ@hol.gr-20090824180208-xhtjpjv8i22sap49 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 717bde163d5..f866107f2b0 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Standards-Version: 3.8.3 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git -XS-Maintainer-Homepage: http://open-object.debian-maintainers.org/ +XSBC-Maintainer-Homepage: http://open-object.debian-maintainers.org/ Package: openerp-server Section: net From c35569ea9e29333c07be56e2225bcb6d4257f4c1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:08 +0300 Subject: [PATCH 58/66] Releasing debian version 5.0.2-0-3. bzr revid: p_christ@hol.gr-20090824180208-4ib67ly9ksamask6 --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 547d5b3c533..8f273a33260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +openerp-server (5.0.2-0-3) unstable; urgency=low + + * Wrapping and sorting depends. + * Correcting spelling of Open ERP. + * Updating maintainer field. + * Updating vcs fields. + * Updating to standards version 3.8.3. + * Dropping old depends on python-xml (Closes: #543127). + * Adding maintainer homepage field to control. + * Marking maintainer homepage field to be also included in binary + packages and changelog. + + -- Daniel Baumann Mon, 24 Aug 2009 18:23:54 +0200 + openerp-server (5.0.2-0-2) unstable; urgency=high * Adding patch from Panos Christeas to forbid RPC From 983ec6643bf187218a31e9e42c4b5ae8ed66285a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 21:02:08 +0300 Subject: [PATCH 59/66] Using dedicated storage directory in /var/lib/openerp-server, that way the addons directory can stay read-only for the unprivileged user. bzr revid: p_christ@hol.gr-20090824180208-khj2awfbic41w324 --- debian/openerp-server.links | 1 + debian/openerp-server.postinst | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/openerp-server.links b/debian/openerp-server.links index 609d00a2036..67620d22397 100644 --- a/debian/openerp-server.links +++ b/debian/openerp-server.links @@ -1 +1,2 @@ /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 index d4dea03812a..48c984d6176 100644 --- a/debian/openerp-server.postinst +++ b/debian/openerp-server.postinst @@ -30,11 +30,13 @@ case "${1}" in chown ${_USERNAME}:adm ${LOGFILE} chmod 0640 ${LOGFILE} - # Setting ownership and permissions - chown ${_USERNAME} /usr/lib/openerp-server/addons -R + # 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 "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" From 8cdac8a1a0ce5f6d89e9068aff5ed3ba2c1b4891 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:54 +0300 Subject: [PATCH 60/66] Commenting out db_name in config (Closes: #542391). bzr revid: p_christ@hol.gr-20090824190054-rzutxtuo1xdxjiwf --- debian/local/openerp-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf index b6891d2646a..33519ed5e43 100644 --- a/debian/local/openerp-server.conf +++ b/debian/local/openerp-server.conf @@ -37,7 +37,7 @@ smtp_user = False smtp_password = False # Specify the database name. -db_name = openerp +#db_name = openerp # Specify the database user name (default None). db_user = openerp From 667cc34a5c84f6d0be90bd2ac2ecbd34c34944a2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:54 +0300 Subject: [PATCH 61/66] Commenting out port in config (Closes: #542406). bzr revid: p_christ@hol.gr-20090824190054-33doy7jyh5cx015u --- debian/local/openerp-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf index 33519ed5e43..4b54cbd7bc2 100644 --- a/debian/local/openerp-server.conf +++ b/debian/local/openerp-server.conf @@ -19,7 +19,7 @@ process_user = openerp interface = localhost # The TCP port on which the server will listen (default 8069). -port = 8070 +#port = 8070 # Enable debug mode (default False). debug_mode = False From 727512596d2aeb2b3cd095405de81c0837185307 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:54 +0300 Subject: [PATCH 62/66] Renaming logfile to openerp-server.log for consistency. bzr revid: p_christ@hol.gr-20090824190054-13xcbtra1n783la4 --- debian/local/openerp-server.conf | 2 +- debian/openerp-server.postinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf index 4b54cbd7bc2..5ee9a132252 100644 --- a/debian/local/openerp-server.conf +++ b/debian/local/openerp-server.conf @@ -9,7 +9,7 @@ debug_mode = False pidfile = /var/run/openerp.pid # The file where the server log will be stored (default False). -logfile = /var/log/openerp.log +logfile = /var/log/openerp-server.log # The unix account on behalf openerp is running. process_user = openerp diff --git a/debian/openerp-server.postinst b/debian/openerp-server.postinst index 48c984d6176..a1e5317b8fc 100644 --- a/debian/openerp-server.postinst +++ b/debian/openerp-server.postinst @@ -5,7 +5,7 @@ set -e . /usr/share/debconf/confmodule CONFFILE="/etc/openerp-server.conf" -LOGFILE="/var/log/openerp.log" +LOGFILE="/var/log/openerp-server.log" case "${1}" in configure) From 7a0b8edd486463302c29af14c8cb56a0e4fe3016 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:55 +0300 Subject: [PATCH 63/66] Commenting out pidfile in config (Closes: #542427). bzr revid: p_christ@hol.gr-20090824190055-m5ha1x8a297oz14l --- debian/local/openerp-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf index 5ee9a132252..ffb6ed49db3 100644 --- a/debian/local/openerp-server.conf +++ b/debian/local/openerp-server.conf @@ -6,7 +6,7 @@ verbose = False debug_mode = False # The file where the server pid will be stored (default False). -pidfile = /var/run/openerp.pid +#pidfile = /var/run/openerp.pid # The file where the server log will be stored (default False). logfile = /var/log/openerp-server.log From 849c090d7413b67d00049b870c564042283c2ca5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:55 +0300 Subject: [PATCH 64/66] Removing debconf handling in postrm, not possible to do that. bzr revid: p_christ@hol.gr-20090824190055-ftntyx7uw8eotvt7 --- debian/openerp-server.postrm | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm index e9effaa8351..136975d147d 100644 --- a/debian/openerp-server.postrm +++ b/debian/openerp-server.postrm @@ -2,31 +2,10 @@ set -e -if [ -e /usr/share/debconf/confmodule ] -then - _DEBCONF="true" - - . /usr/share/debconf/confmodule -fi - case "${1}" in remove) - if [ "${_DEBCONF}" = "true" ] - then - db_version 2.0 - - db_get openerp-server/username - _USERNAME="${RET}" - - db_stop - fi - - if [ -z "${_USERNAME}" ] - then - _USERNAME="openerp" - fi - - _GROUPNAME="${_USERNAME}" + _USERNAME="openerp" + _GROUPNAME="openerp" if [ -x /usr/sbin/deluser ] then @@ -39,8 +18,8 @@ case "${1}" in fi rm -f /usr/lib/openerp-server/addons/__init__.pyc - rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server/addons - rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server + rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server/addons || true + rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server || true ;; purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) From 4a996303d9ea951755cd28d01e3de51adcef4207 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:55 +0300 Subject: [PATCH 65/66] Removing local storage directory on purge. bzr revid: p_christ@hol.gr-20090824190055-dyc3v18o32f9zdz3 --- debian/openerp-server.postrm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm index 136975d147d..02b3d0a6817 100644 --- a/debian/openerp-server.postrm +++ b/debian/openerp-server.postrm @@ -22,7 +22,11 @@ case "${1}" in rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server || true ;; - purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + purge) + rm -rf /var/lib/openerp-server + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; From e27fb4893e1edf0186fed919680b406df2a8a935 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Aug 2009 22:00:56 +0300 Subject: [PATCH 66/66] Releasing debian version 5.0.3-0-1. bzr revid: p_christ@hol.gr-20090824190056-thb0cbw0vmcgatta --- debian/changelog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f273a33260..0735d998cec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +openerp-server (5.0.3-0-1) unstable; urgency=low + + * Merging upstream version 5.0.3-0. + * Removing xmlrpc.patch, went upstream. + * Using dedicated storage directory in /var/lib/openerp-server, that + way the addons directory can stay read-only for the unprivileged + user. + * Commenting out db_name in config (Closes: #542391). + * Commenting out port in config (Closes: #542406). + * Renaming logfile to openerp-server.log for consistency. + * Commenting out pidfile in config (Closes: #542427). + * Removing debconf handling in postrm, not possible to do that. + * Removing local storage directory on purge. + + -- Daniel Baumann Mon, 24 Aug 2009 20:16:55 +0200 + openerp-server (5.0.2-0-3) unstable; urgency=low * Wrapping and sorting depends.