[Python-apps-commits] r7951 - in packages/openerp6/trunk (17 files)
xnox-guest at users.alioth.debian.org
xnox-guest at users.alioth.debian.org
Tue Dec 13 17:30:43 UTC 2011
Date: Tuesday, December 13, 2011 @ 17:30:41
Author: xnox-guest
Revision: 7951
Updates
Added:
packages/openerp6/trunk/debian/local/apache2.conf
packages/openerp6/trunk/debian/local/wsgi_app.py
packages/openerp6/trunk/debian/openerp6-client.install
packages/openerp6/trunk/debian/openerp6-server.dirs
packages/openerp6/trunk/debian/openerp6-server.links
packages/openerp6/trunk/debian/openerp6-web.install
packages/openerp6/trunk/debian/openerp6-web.links
packages/openerp6/trunk/debian/openerp6-web.postinst
packages/openerp6/trunk/debian/openerp6-web.postrm
packages/openerp6/trunk/debian/openerp6-web.preinst
packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch
Modified:
packages/openerp6/trunk/debian/ (properties)
packages/openerp6/trunk/debian/control
packages/openerp6/trunk/debian/openerp6-server.install
packages/openerp6/trunk/debian/patches/series
packages/openerp6/trunk/debian/rules
Deleted:
packages/openerp6/trunk/debian/clean
Deleted: packages/openerp6/trunk/debian/clean
===================================================================
--- packages/openerp6/trunk/debian/clean 2011-12-13 15:22:42 UTC (rev 7950)
+++ packages/openerp6/trunk/debian/clean 2011-12-13 17:30:41 UTC (rev 7951)
@@ -1 +0,0 @@
-./bin/addons/wiki/web/widgets/rss/feedparser.py
Modified: packages/openerp6/trunk/debian/control
===================================================================
--- packages/openerp6/trunk/debian/control 2011-12-13 15:22:42 UTC (rev 7950)
+++ packages/openerp6/trunk/debian/control 2011-12-13 17:30:41 UTC (rev 7951)
@@ -35,3 +35,46 @@
.
This package contains the Open ERP server, install openerp-client package for
the client.
+
+Package: openerp6-web
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, adduser, libjs-mochikit (>= 1.4),
+ libjs-mootools, python-beaker (>= 1.1), python-cherrypy3 (>= 3.1.2),
+ python-dateutil, python-feedparser, python-formencode (>= 1.2.2),
+ python-mako (>= 0.2.5), python-pybabel (>= 0.9.4), python-pyparsing,
+ python-simplejson (>= 2.0.9), ckeditor, libapache2-mod-wsgi
+Recommends: openerp6-server
+Suggests: openerp6-client
+Replaces: openerp-web
+Conflicts: openerp-web
+Description: Enterprise Resource Management (web frontend)
+ 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 Open ERP web frontend, install openerp6-client
+ package for the desktop client.
+
+Package: openerp6-client
+Architecture: all
+Depends:
+ ${misc:Depends}, python, python-glade2, python-gtk2, python-pydot, python-tz,
+ python-lxml,
+ python-hippocanvas, python-matplotlib
+Recommends:
+ python-openssl, openoffice.org-writer, evince | pdf-viewer
+Suggests: openerp6-server
+Description: Enterprise Resource Management (client)
+ 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 Open ERP client, install openerp6-server package for
+ the server.
Added: packages/openerp6/trunk/debian/local/apache2.conf
===================================================================
--- packages/openerp6/trunk/debian/local/apache2.conf (rev 0)
+++ packages/openerp6/trunk/debian/local/apache2.conf 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,4 @@
+WSGIDaemonProcess openerp processes=5 threads=2 display-name=%{GROUP}
+WSGIProcessGroup openerp
+WSGIScriptAlias / /usr/share/openerp-web/wsgi/wsgi_app.py
+
Added: packages/openerp6/trunk/debian/local/wsgi_app.py
===================================================================
--- packages/openerp6/trunk/debian/local/wsgi_app.py (rev 0)
+++ packages/openerp6/trunk/debian/local/wsgi_app.py 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,25 @@
+import os
+import sys
+
+sys.path.append('/usr/share/openerp-web')
+
+from cherrypy._cpconfig import as_dict
+import openobject
+
+config = as_dict('/etc/openerp-web/openerp-web.cfg')
+
+if ('/' in config and 'tools.sessions.storage_type' in config['/']
+ and config['/']['tools.sessions.storage_type'] == 'file'):
+ storage_path = config['/']['tools.sessions.storage_path']
+ for the_file in os.listdir(storage_path):
+ file_path = os.path.join(storage_path, the_file)
+ try:
+ if os.path.isfile(file_path):
+ os.unlink(file_path)
+ except Exception, e:
+ print e
+
+openobject.configure(config)
+openobject.enable_static_paths() # serve static file via the wsgi server
+
+application = openobject.application
Added: packages/openerp6/trunk/debian/openerp6-client.install
===================================================================
--- packages/openerp6/trunk/debian/openerp6-client.install (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-client.install 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1 @@
+client/bin /usr/share/openerp6/
Added: packages/openerp6/trunk/debian/openerp6-server.dirs
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.dirs (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-server.dirs 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,3 @@
+/var/lib/openerp6/filestore
+/var/lib/openerp6/backup
+/var/log/openerp6
Modified: packages/openerp6/trunk/debian/openerp6-server.install
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.install 2011-12-13 15:22:42 UTC (rev 7950)
+++ packages/openerp6/trunk/debian/openerp6-server.install 2011-12-13 17:30:41 UTC (rev 7951)
@@ -1,3 +1,3 @@
-debian/local/server.conf.tpl /usr/share/openerp6-server
-pixmaps /usr/share/openerp6-server
-bin /usr/share/openerp6-server
+debian/local/server.conf.tpl /usr/share/openerp6
+bin /usr/share/openerp6
+pixmaps /usr/share/openerp6/bin
Added: packages/openerp6/trunk/debian/openerp6-server.links
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.links (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-server.links 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,3 @@
+/var/lib/openerp6/filestore /usr/share/openerp6/server/filestore
+/var/lib/openerp6/backup /usr/share/openerp6/server/backup
+
Added: packages/openerp6/trunk/debian/openerp6-web.install
===================================================================
--- packages/openerp6/trunk/debian/openerp6-web.install (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-web.install 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,3 @@
+web/addons /usr/share/openerp6/web
+web/openobject /usr/share/openerp6/web
+web/pixmaps /usr/share/openerp6/web
Added: packages/openerp6/trunk/debian/openerp6-web.links
===================================================================
--- packages/openerp6/trunk/debian/openerp6-web.links (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-web.links 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,3 @@
+/usr/share/javascript/mochikit/MochiKit.js /usr/share/openerp6/web/openobject/static/javascript/MochiKit.js
+/usr/share/javascript/mootools/mootools.js /usr/share/openerp6/web/addons/view_diagram/static/javascript/draw2d/mootools.js
+/usr/share/javascript/ckeditor /usr/share/openerp6/web/addons/widget_ckeditor/static/javascript/ck_editor
Added: packages/openerp6/trunk/debian/openerp6-web.postinst
===================================================================
--- packages/openerp6/trunk/debian/openerp6-web.postinst (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-web.postinst 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ configure)
+ chown www-data:www-data /var/lib/openerp-web/sessions
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`{$1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/openerp6/trunk/debian/openerp6-web.postrm
===================================================================
--- packages/openerp6/trunk/debian/openerp6-web.postrm (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-web.postrm 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ purge)
+ rm -rf /var/lib/openerp-web
+ ;;
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/openerp6/trunk/debian/openerp6-web.preinst
===================================================================
--- packages/openerp6/trunk/debian/openerp6-web.preinst (rev 0)
+++ packages/openerp6/trunk/debian/openerp6-web.preinst 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+USER="openerp-web"
+
+case "${1}" in
+ upgrade)
+ if [ -x /usr/sbin/deluser ]
+ then
+ deluser --quiet --system ${USER}
+ fi
+
+ if [ -x /usr/sbin/delgroup ]
+ then
+ delgroup --quiet --system --only-if-empty ${USER} || true
+ fi
+
+ ;;
+
+ install|abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch (rev 0)
+++ packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch 2011-12-13 17:30:41 UTC (rev 7951)
@@ -0,0 +1,13 @@
+Index: b/bin/addons/base/res/res_company.py
+===================================================================
+--- a/bin/addons/base/res/res_company.py
++++ b/bin/addons/base/res/res_company.py
+@@ -185,7 +185,7 @@ class res_company(osv.osv):
+
+ def _get_logo(self, cr, uid, ids):
+ return open(os.path.join(
+- tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'),
++ tools.config['root_path'], 'pixmaps', 'openerp-header.png'),
+ 'rb') .read().encode('base64')
+
+ def _get_header3(self,cr,uid,ids):
Modified: packages/openerp6/trunk/debian/patches/series
===================================================================
--- packages/openerp6/trunk/debian/patches/series 2011-12-13 15:22:42 UTC (rev 7950)
+++ packages/openerp6/trunk/debian/patches/series 2011-12-13 17:30:41 UTC (rev 7951)
@@ -2,6 +2,7 @@
01_server/config-comments.patch
01_server/fix-yaml-import.patch
01_server/manpage-whatis.patch
+01_server/move_pixmaps.patch
02_web/01_tinydict-getstate.patch
02_web/02_config-changes.patch
02_web/03_wsgi-x-location.patch
Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules 2011-12-13 15:22:42 UTC (rev 7950)
+++ packages/openerp6/trunk/debian/rules 2011-12-13 17:30:41 UTC (rev 7951)
@@ -6,6 +6,8 @@
DH_VERBOSE:=1
SERVER:=$(DEB_SOURCE)-server
+WEB:=$(DEB_SOURCE)-web
+CLIENT:=$(DEB_SOURCE)-client
%:
dh $@ --with python2
@@ -14,27 +16,28 @@
override_dh_auto_build override_dh_auto_install:
override_dh_auto_test:
-override_dh_installdirs:
- dh_installdirs /var/lib/$(DEB_SOURCE)/filestore /var/lib/$(DEB_SOURCE)/backup /var/log/$(DEB_SOURCE) /usr/share/$(DEB_SOURCE)/
+override_dh_python2:
+ dh_python2 /usr/share/openerp6
override_dh_install:
dh_install
- cd debian/$(SERVER)/usr/share/$(DEB_SOURCE)/ && \
- mv bin server && \
- find -name LICENSE -delete && \
- find -name openerp_plugin.jar -delete
+ find debian/$(DEB_SOURCE)-*/ \
+ -name LICENSE -or \
+ -name openerp_plugin.jar -or \
+ -name feedparser.py -or \
+ -name '*.pyd' -or \
+ -name '*.exe' -or \
+ -name ck_editor \
+ | xargs rm -rf
+ cd debian/$(SERVER)/usr/share/$(DEB_SOURCE)/ && mv bin server
+ cd debian/$(CLIENT)/usr/share/$(DEB_SOURCE)/ && mv bin client
override_dh_installchangelogs:
dh_installchangelogs doc/Changelog
-override_dh_link:
- 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/$(DEB_SOURCE)/server/addons -type f -print0 | xargs -0 chmod 0644
+ find debian/$(DEB_SOURCE)-*/usr/share/$(DEB_SOURCE)/ -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
@@ -64,6 +67,10 @@
rm -f $(patches)
./debian/rules $(patches)
+debian/patches/series:
+ rm $@
+ cd debian/patches && find */* -type f | sort | sed 's_\./__' > series
+
generate-config:
HOME=./debian/local ./bin/openerp-server.py \
-s --stop-after-init \
@@ -82,4 +89,4 @@
mv openerp-client-$(DEB_VERSION_UPSTREAM).tar.gz $(package_name).orig-client.tar.gz
mv openerp-web-$(DEB_VERSION_UPSTREAM).tar.gz $(package_name).orig-web.tar.gz
-.PHONY: stable-updates generate-config get-orig-source
+.PHONY: stable-updates generate-config get-orig-source debian/patches/series
More information about the Python-apps-commits
mailing list