[Python-apps-commits] r7887 - in packages/openerp6/trunk (8 files)
xnox-guest at users.alioth.debian.org
xnox-guest at users.alioth.debian.org
Tue Nov 29 20:12:14 UTC 2011
Date: Tuesday, November 29, 2011 @ 20:12:12
Author: xnox-guest
Revision: 7887
Fix ups and renames
Added:
packages/openerp6/trunk/debian/local/server.conf.tpl
(from rev 7886, packages/openerp6/trunk/debian/local/config)
Modified:
packages/openerp6/trunk/debian/ (properties)
packages/openerp6/trunk/debian/openerp6-server.install
packages/openerp6/trunk/debian/openerp6-server.postinst
packages/openerp6/trunk/debian/openerp6-server.templates
packages/openerp6/trunk/debian/po/templates.pot
packages/openerp6/trunk/debian/rules
Deleted:
packages/openerp6/trunk/debian/local/config
Deleted: packages/openerp6/trunk/debian/local/config
===================================================================
--- packages/openerp6/trunk/debian/local/config 2011-11-29 20:12:02 UTC (rev 7886)
+++ packages/openerp6/trunk/debian/local/config 2011-11-29 20:12:12 UTC (rev 7887)
@@ -1,105 +0,0 @@
-[options]
-# specify an alternative addons path.; default = None
-# addons_path = None
-# set superadmin password; default = admin
-admin_passwd = admin
-assert_exit_level = error
-cache_timeout = 100000
-csv_internal_sep = ,
-# specify the database host; default = False
-db_host = _DBC_DBSERVER_
-# specify the the maximum number of physical connections to posgresql;
-# default = 64
-db_maxconn = 64
-# specify the database name; default = False
-db_name = _DBC_DBNAME_
-# specify the database password; default = False
-db_password = _DBC_DBPASS_
-# specify the database port; default = False
-db_port = _DBC_DBPORT_
-# specify the database user name; default = False
-db_user = _DBC_DBUSER_
-debug_mode = False
-demo = {}
-# specify the smtp email address for sending email; default = False
-email_from = False
-# use this for big data importation, if it crashes you will be able to
-# continue at the current state. provide a filename to store
-# intermediate importation states.; default =
-import_partial =
-# disable the ability to return the list of databases; default = True
-list_db = True
-# specify the level of the logging. accepted values: ['info',
-# 'debug_rpc', 'warn', 'test', 'critical', 'debug_sql', 'error',
-# 'debug', 'debug_rpc_answer', 'notset']; default = 20
-log_level = info
-# file where the server log will be stored; default = None
-logfile = /var/log/openerp6-server/openerp6-server.log
-login_message = False
-# do not rotate the logfile; default = True
-logrotate = True
-# disable the netrpc protocol; default = True
-netrpc = True
-# specify the tcp ip address for the netrpc protocol; default =
-netrpc_interface = localhost
-# specify the tcp port for the netrpc protocol; default = 8070
-netrpc_port = 8070
-# force a limit on the maximum age of records kept in the virtual
-# osv_memory tables. this is a decimal value expressed in hours, and
-# the default is 1 hour.; default = 1
-osv_memory_age_limit = 1.0
-# force a limit on the maximum number of records kept in the virtual
-# osv_memory tables. the default is false, which means no count-based
-# limit.; default = None
-osv_memory_count_limit = False
-# specify the pg executable path; default = None
-pg_path = None
-reportgz = False
-# specify the certificate file for the ssl connection; default = server.cert
-secure_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
-# specify the private key file for the ssl connection; default = server.pkey
-secure_pkey_file = /etc/ssl/private/ssl-cert-snakeoil.key
-# specify the smtp password for sending email; default = False
-smtp_password = False
-# specify the smtp port; default = 25
-smtp_port = 25
-# specify the smtp server for sending email; default = localhost
-smtp_server = localhost
-# specify the smtp server support ssl or not; default = False
-smtp_ssl = False
-# specify the smtp username for sending email; default = False
-smtp_user = False
-# specify the directory containing your static html files (e.g
-# '/var/www/'); default = None
-static_http_document_root = None
-# enable static http service for serving plain html files; default = False
-static_http_enable = False
-# specify the url root prefix where you want web browsers to access
-# your static html files (e.g '/'); default = None
-static_http_url_prefix = None
-# send the log to the syslog server; default = False
-syslog = False
-# commit database changes performed by tests.; default = False
-test_commit = False
-# disable loading test files.; default = False
-test_disable = False
-# launch a yml test file.; default = False
-test_file = False
-# if set, will save sample of all reports in this directory.; default = False
-test_report_directory = False
-timezone = False
-translate_modules = ['all']
-without_demo = False
-# disable the xml-rpc protocol; default = True
-xmlrpc = True
-# specify the tcp ip address for the xml-rpc protocol; default =
-xmlrpc_interface = localhost
-# specify the tcp port for the xml-rpc protocol; default = 8069
-xmlrpc_port = 8069
-# disable the xml-rpc secure protocol; default = True
-xmlrpcs = True
-# specify the tcp ip address for the xml-rpc secure protocol; default =
-xmlrpcs_interface = localhost
-# specify the tcp port for the xml-rpc secure protocol; default = 8071
-xmlrpcs_port = 8071
-
Copied: packages/openerp6/trunk/debian/local/server.conf.tpl (from rev 7886, packages/openerp6/trunk/debian/local/config)
===================================================================
--- packages/openerp6/trunk/debian/local/server.conf.tpl (rev 0)
+++ packages/openerp6/trunk/debian/local/server.conf.tpl 2011-11-29 20:12:12 UTC (rev 7887)
@@ -0,0 +1,105 @@
+[options]
+# specify an alternative addons path.; default = None
+# addons_path = None
+# set superadmin password; default = admin
+admin_passwd = admin
+assert_exit_level = error
+cache_timeout = 100000
+csv_internal_sep = ,
+# specify the database host; default = False
+db_host = _DBC_DBSERVER_
+# specify the the maximum number of physical connections to posgresql;
+# default = 64
+db_maxconn = 64
+# specify the database name; default = False
+db_name = _DBC_DBNAME_
+# specify the database password; default = False
+db_password = _DBC_DBPASS_
+# specify the database port; default = False
+db_port = _DBC_DBPORT_
+# specify the database user name; default = False
+db_user = _DBC_DBUSER_
+debug_mode = False
+demo = {}
+# specify the smtp email address for sending email; default = False
+email_from = False
+# use this for big data importation, if it crashes you will be able to
+# continue at the current state. provide a filename to store
+# intermediate importation states.; default =
+import_partial =
+# disable the ability to return the list of databases; default = True
+list_db = True
+# specify the level of the logging. accepted values: ['info',
+# 'debug_rpc', 'warn', 'test', 'critical', 'debug_sql', 'error',
+# 'debug', 'debug_rpc_answer', 'notset']; default = 20
+log_level = info
+# file where the server log will be stored; default = None
+logfile = /var/log/openerp6-server/openerp6-server.log
+login_message = False
+# do not rotate the logfile; default = True
+logrotate = True
+# disable the netrpc protocol; default = True
+netrpc = True
+# specify the tcp ip address for the netrpc protocol; default =
+netrpc_interface = localhost
+# specify the tcp port for the netrpc protocol; default = 8070
+netrpc_port = 8070
+# force a limit on the maximum age of records kept in the virtual
+# osv_memory tables. this is a decimal value expressed in hours, and
+# the default is 1 hour.; default = 1
+osv_memory_age_limit = 1.0
+# force a limit on the maximum number of records kept in the virtual
+# osv_memory tables. the default is false, which means no count-based
+# limit.; default = None
+osv_memory_count_limit = False
+# specify the pg executable path; default = None
+pg_path = None
+reportgz = False
+# specify the certificate file for the ssl connection; default = server.cert
+secure_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
+# specify the private key file for the ssl connection; default = server.pkey
+secure_pkey_file = /etc/ssl/private/ssl-cert-snakeoil.key
+# specify the smtp password for sending email; default = False
+smtp_password = False
+# specify the smtp port; default = 25
+smtp_port = 25
+# specify the smtp server for sending email; default = localhost
+smtp_server = localhost
+# specify the smtp server support ssl or not; default = False
+smtp_ssl = False
+# specify the smtp username for sending email; default = False
+smtp_user = False
+# specify the directory containing your static html files (e.g
+# '/var/www/'); default = None
+static_http_document_root = None
+# enable static http service for serving plain html files; default = False
+static_http_enable = False
+# specify the url root prefix where you want web browsers to access
+# your static html files (e.g '/'); default = None
+static_http_url_prefix = None
+# send the log to the syslog server; default = False
+syslog = False
+# commit database changes performed by tests.; default = False
+test_commit = False
+# disable loading test files.; default = False
+test_disable = False
+# launch a yml test file.; default = False
+test_file = False
+# if set, will save sample of all reports in this directory.; default = False
+test_report_directory = False
+timezone = False
+translate_modules = ['all']
+without_demo = False
+# disable the xml-rpc protocol; default = True
+xmlrpc = True
+# specify the tcp ip address for the xml-rpc protocol; default =
+xmlrpc_interface = localhost
+# specify the tcp port for the xml-rpc protocol; default = 8069
+xmlrpc_port = 8069
+# disable the xml-rpc secure protocol; default = True
+xmlrpcs = True
+# specify the tcp ip address for the xml-rpc secure protocol; default =
+xmlrpcs_interface = localhost
+# specify the tcp port for the xml-rpc secure protocol; default = 8071
+xmlrpcs_port = 8071
+
Modified: packages/openerp6/trunk/debian/openerp6-server.install
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.install 2011-11-29 20:12:02 UTC (rev 7886)
+++ packages/openerp6/trunk/debian/openerp6-server.install 2011-11-29 20:12:12 UTC (rev 7887)
@@ -1,3 +1,3 @@
-debian/local/config /usr/share/openerp6-server
+debian/local/server.conf.tpl /usr/share/openerp6-server
pixmaps /usr/share/openerp6-server
bin /usr/share/openerp6-server
Modified: packages/openerp6/trunk/debian/openerp6-server.postinst
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.postinst 2011-11-29 20:12:02 UTC (rev 7886)
+++ packages/openerp6/trunk/debian/openerp6-server.postinst 2011-11-29 20:12:12 UTC (rev 7887)
@@ -6,7 +6,7 @@
. /usr/share/dbconfig-common/dpkg/postinst.pgsql
CONF="/etc/openerp6-server.conf"
-CONFTPL="/usr/share/openerp6-server/openerp6-server.conf.tpl"
+CONFTPL="/usr/share/openerp6/server.conf.tpl"
USER="openerp6"
if ! getent passwd | grep -q "^$USER:"; then
adduser --system --no-create-home --quiet --gecos 'Open ERP server' --group $USER
Modified: packages/openerp6/trunk/debian/openerp6-server.templates
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.templates 2011-11-29 20:12:02 UTC (rev 7886)
+++ packages/openerp6/trunk/debian/openerp6-server.templates 2011-11-29 20:12:12 UTC (rev 7887)
@@ -1,6 +1,6 @@
Template: openerp-server/password
Type: string
-_Default: admin
+Default: admin
_Description: Superadmin password for Open ERP server v${VER}:
This password is used by Open ERP to allow administration of Open ERP
instances. Users need to know this password if they want to install and
Modified: packages/openerp6/trunk/debian/po/templates.pot
===================================================================
--- packages/openerp6/trunk/debian/po/templates.pot 2011-11-29 20:12:02 UTC (rev 7886)
+++ packages/openerp6/trunk/debian/po/templates.pot 2011-11-29 20:12:12 UTC (rev 7887)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openerp6 at packages.debian.org\n"
-"POT-Creation-Date: 2011-11-26 23:56+0000\n"
+"POT-Creation-Date: 2011-11-27 00:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,20 +18,14 @@
"Content-Transfer-Encoding: 8bit\n"
#. Type: string
-#. Default
-#: ../openerp6-server.templates:1001
-msgid "admin"
-msgstr ""
-
-#. Type: string
#. Description
-#: ../openerp6-server.templates:1002
+#: ../openerp6-server.templates:1001
msgid "Superadmin password for Open ERP server v${VER}:"
msgstr ""
#. Type: string
#. Description
-#: ../openerp6-server.templates:1002
+#: ../openerp6-server.templates:1001
msgid ""
"This password is used by Open ERP to allow administration of Open ERP "
"instances. Users need to know this password if they want to install and "
@@ -41,6 +35,6 @@
#. Type: string
#. Description
-#: ../openerp6-server.templates:1002
+#: ../openerp6-server.templates:1001
msgid "This password is stored in the openerp-server config file."
msgstr ""
Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules 2011-11-29 20:12:02 UTC (rev 7886)
+++ packages/openerp6/trunk/debian/rules 2011-11-29 20:12:12 UTC (rev 7887)
@@ -15,13 +15,12 @@
override_dh_auto_test:
override_dh_installdirs:
- dh_installdirs /var/lib/$(SERVER)/filestore /var/lib/$(SERVER)/backup /var/log/$(SERVER) /usr/share/$(SERVER)/
+ dh_installdirs /var/lib/$(DEB_SOURCE)/filestore /var/lib/$(DEB_SOURCE)/backup /var/log/$(DEB_SOURCE) /usr/share/$(DEB_SOURCE)/
override_dh_install:
dh_install
- cd debian/$(SERVER)/usr/share/$(SERVER)/ && \
- mv config $(SERVER).conf.tpl && \
- mv bin $(SERVER) && \
+ cd debian/$(SERVER)/usr/share/$(DEB_SOURCE)/ && \
+ mv bin server && \
find -name LICENSE -delete && \
find -name openerp_plugin.jar -delete
@@ -29,15 +28,15 @@
dh_installchangelogs doc/Changelog
override_dh_link:
- dh_link -- /var/lib/$(SERVER)/filestore /usr/share/$(SERVER)/$(SERVER)/filestore \
- /var/lib/$(SERVER)/backup /usr/share/$(SERVER)/$(SERVER)/backup
+ dh_link -- /var/lib/$(DEB_SOURCE)/filestore /usr/share/$(DEB_SOURCE)/server/filestore \
+ /var/lib/$(DEB_SOURCE)/backup /usr/share/$(DEB_SOURCE)/server/backup
override_dh_fixperms:
dh_fixperms
- find debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/addons -type f -print0 | xargs -0 chmod 0644
- find debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/addons -name "*.sh" -print0 | xargs -0 chmod 0755
- chmod 755 debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/openerp-server.py
+ find debian/$(SERVER)/usr/share/$(DEB_SOURCE)/server/addons -type f -print0 | xargs -0 chmod 0644
+ find debian/$(SERVER)/usr/share/$(DEB_SOURCE)/server/addons -name "*.sh" -print0 | xargs -0 chmod 0755
+ chmod 755 debian/$(SERVER)/usr/share/$(DEB_SOURCE)/server/openerp-server.py
# You can specify local checkout, e.g.
# export UPSTREAM_BRANCH=~/src/openerp/6.0/server
@@ -69,7 +68,7 @@
HOME=./debian/local ./bin/openerp-server.py \
-s --stop-after-init \
--logfile=/var/log/$(SERVER)/$(SERVER).log
- sed -f ./debian/local/config.sed ./debian/local/.openerp_serverrc > debian/local/config
+ sed -f ./debian/local/config.sed ./debian/local/.openerp_serverrc > debian/local/server.conf.tpl
rm ./debian/local/.openerp_serverrc
uscan_options:= --no-conf --force-download --download-current-version --no-symlink --destdir .
More information about the Python-apps-commits
mailing list