debian: use the standard conf file, adapt init and copyright

bzr revid: p_christ@hol.gr-20110117152605-qtifgtoydws7ox8q

diff --git a/debian/copyright b/debian/copyright
index 9844182..3f50a3a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Upstream-Contact: n/a
+Upstream-Contact: OpenERP <support@openerp.com>
 Upstream-Homepage: http://www.openerp.com/
 Maintainer-Contact: Debian Open Object Maintainers <gnunet@lists.debian-maintainers.org>
 Maintainer-Homepage: http://open-object.debian-maintainers.org/
 
 Files: *
-Copyright: (C) 2004-2010 Tiny.be <info@tiny.be>
+Copyright: (C) 2004-2010 OpenERP SA. (www.openerp.com)
 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
@@ -23,28 +23,6 @@ License: GPL-3+
  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 <info@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

diff --git a/debian/openerp-server.init b/debian/openerp-server.init
index 08c39e5..1f5c882 100644 (file)
--- a/debian/openerp-server.init
+++ b/debian/openerp-server.init
@@ -29,7 +29,8 @@ case "${1}" in
 
                start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \
                        --chuid ${USER} --background --make-pidfile \
-                       --exec ${DAEMON} -- --config=/etc/openerp-server.conf
+                       --exec ${DAEMON} -- --config=/etc/openerp-server.conf \
+                           --logfile=/var/log/openerp-server.log
 
                echo "${NAME}."
                ;;
@@ -53,7 +54,8 @@ case "${1}" in
 
                start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \
                        --chuid ${USER} --background --make-pidfile \
-                       --exec ${DAEMON} -- --config=/etc/openerp-server.conf
+                       --exec ${DAEMON} -- --config=/etc/openerp-server.conf \
+                           --logfile=/var/log/openerp-server.log
 
                echo "${NAME}."
                ;;

diff --git a/debian/openerp-server.install b/debian/openerp-server.install
index ccfbbb2..78a4a64 100644 (file)
--- a/debian/openerp-server.install
+++ b/debian/openerp-server.install
@@ -1 +1 @@
-debian/local/openerp-server.conf       /etc
+doc/openerp-server.conf                /etc