Merge lp:~bstanciu/openobject-server/trunk-dev into lp:openobject-server

[Bogdan Stanciu]

repaired the setup process, broken due to misplacement of openerp-server.py file and wrong references.

repaired the setup process, broken due to misplacement of openerp-server.py file and wrong references.

[Vo Minh Thu (thu)]

The bin to openerp renaming did cause problems in the setup.py and the setup.py itself was later corrected. So this branch is unnecessary now.

review: Disapprove

Unmerged revisions

3355. By Bogdan Stanciu on 2011-02-09

[FIX] repaired broken setup due to wrong references in various files.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-10-18 21:59:29 +0000
+++ MANIFEST.in	2011-02-09 22:36:08 +0000
@@ -3,15 +3,15 @@
 include MANIFEST.in
 include setup.nsi
 include setup.cfg
-include bin/import_xml.rng
-include bin/server.cert
-include bin/server.pkey
-include bin/gpl.txt
+include openerp/import_xml.rng
+#include openerp/server.cert
+#include openerp/server.pkey
+#include openerp/gpl.txt
 include man/openerp-server.1
 include man/openerp_serverrc.5
 recursive-include pixmaps *
 recursive-include win32 *
 recursive-include doc *
-recursive-include bin *xml *xsl *sql *rml *sxw *csv *rng
-graft bin/addons
+recursive-include openerp *xml *xsl *sql *rml *sxw *csv *rng
+graft openerp/addons
 global-exclude *pyc *~

=== removed file 'openerp-server.py'
--- openerp-server.py	2011-02-08 09:29:23 +0000
+++ openerp-server.py	1970-01-01 00:00:00 +0000
@@ -1,258 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-"""
-OpenERP - Server
-OpenERP is an ERP+CRM program for small and medium businesses.
-
-The whole source code is distributed under the terms of the
-GNU Public Licence.
-
-(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
-"""
-
-#----------------------------------------------------------
-# python imports
-#----------------------------------------------------------
-import logging
-import os
-import signal
-import sys
-import threading
-import traceback
-
-import openerp.release as release
-__author__ = release.author
-__version__ = release.version
-
-if os.name == 'posix':
-    import pwd
-    # We DON't log this using the standard logger, because we might mess
-    # with the logfile's permissions. Just do a quick exit here.
-    if pwd.getpwuid(os.getuid())[0] == 'root' :
-        sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
-        sys.exit(1)
-
-#-----------------------------------------------------------------------
-# import the tools module so that the commandline parameters are parsed
-#-----------------------------------------------------------------------
-import openerp.tools as tools
-tools.config.parse_config(sys.argv[1:])
-
-#----------------------------------------------------------
-# get logger
-#----------------------------------------------------------
-import openerp.netsvc as netsvc
-netsvc.init_logger()
-logger = logging.getLogger('server')
-
-logger.info("OpenERP version - %s", release.version)
-for name, value in [('addons_path', tools.config['addons_path']),
-                    ('database hostname', tools.config['db_host'] or 'localhost'),
-                    ('database port', tools.config['db_port'] or '5432'),
-                    ('database user', tools.config['db_user'])]:
-    logger.info("%s - %s", name, value)
-
-# Don't allow if the connection to PostgreSQL done by postgres user
-if tools.config['db_user'] == 'postgres':
-    logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
-    sys.exit(1)
-
-import time
-
-#----------------------------------------------------------
-# init net service
-#----------------------------------------------------------
-logger.info('initialising distributed objects services')
-
-#---------------------------------------------------------------
-# connect to the database and initialize it with base if needed
-#---------------------------------------------------------------
-import openerp.pooler as pooler
-
-#----------------------------------------------------------
-# import basic modules
-#----------------------------------------------------------
-import openerp.osv as osv
-import openerp.workflow as workflow
-import openerp.report as report
-import openerp.service as service
-
-#----------------------------------------------------------
-# import addons
-#----------------------------------------------------------
-
-import openerp.addons as addons
-
-#----------------------------------------------------------
-# Load and update databases if requested
-#----------------------------------------------------------
-
-import openerp.service.http_server as service_http_server
-
-if not ( tools.config["stop_after_init"] or \
-    tools.config["translate_in"] or \
-    tools.config["translate_out"] ):
-    service_http_server.init_servers()
-    service_http_server.init_xmlrpc()
-    service_http_server.init_static_http()
-
-    import openerp.service.netrpc_server as service_netrpc_server
-    service_netrpc_server.init_servers()
-
-if tools.config['db_name']:
-    for dbname in tools.config['db_name'].split(','):
-        db,pool = pooler.get_db_and_pool(dbname, update_module=tools.config['init'] or tools.config['update'], pooljobs=False)
-        cr = db.cursor()
-
-        if tools.config["test_file"]:
-            logger.info('loading test file %s', tools.config["test_file"])
-            tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True)
-            cr.rollback()
-
-        pool.get('ir.cron')._poolJobs(db.dbname)
-
-        cr.close()
-
-#----------------------------------------------------------
-# translation stuff
-#----------------------------------------------------------
-if tools.config["translate_out"]:
-    import csv
-
-    if tools.config["language"]:
-        msg = "language %s" % (tools.config["language"],)
-    else:
-        msg = "new language"
-    logger.info('writing translation file for %s to %s', msg, tools.config["translate_out"])
-
-    fileformat = os.path.splitext(tools.config["translate_out"])[-1][1:].lower()
-    buf = file(tools.config["translate_out"], "w")
-    dbname = tools.config['db_name']
-    cr = pooler.get_db(dbname).cursor()
-    tools.trans_export(tools.config["language"], tools.config["translate_modules"] or ["all"], buf, fileformat, cr)
-    cr.close()
-    buf.close()
-
-    logger.info('translation file written successfully')
-    sys.exit(0)
-
-if tools.config["translate_in"]:
-    context = {'overwrite': tools.config["overwrite_existing_translations"]}
-    dbname = tools.config['db_name']
-    cr = pooler.get_db(dbname).cursor()
-    tools.trans_load(cr,
-                     tools.config["translate_in"], 
-                     tools.config["language"],
-                     context=context)
-    tools.trans_update_res_ids(cr)
-    cr.commit()
-    cr.close()
-    sys.exit(0)
-
-#----------------------------------------------------------------------------------
-# if we don't want the server to continue to run after initialization, we quit here
-#----------------------------------------------------------------------------------
-if tools.config["stop_after_init"]:
-    sys.exit(0)
-
-
-#----------------------------------------------------------
-# Launch Servers
-#----------------------------------------------------------
-
-LST_SIGNALS = ['SIGINT', 'SIGTERM']
-
-SIGNALS = dict(
-    [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
-)
-
-netsvc.quit_signals_received = 0
-
-def handler(signum, frame):
-    """
-    :param signum: the signal number
-    :param frame: the interrupted stack frame or None
-    """
-    netsvc.quit_signals_received += 1
-    if netsvc.quit_signals_received > 1:
-        sys.stderr.write("Forced shutdown.\n")
-        os._exit(0)
-
-def dumpstacks(signum, frame):
-    # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
-    # modified for python 2.5 compatibility
-    thread_map = dict(threading._active, **threading._limbo)
-    id2name = dict([(threadId, thread.getName()) for threadId, thread in thread_map.items()])
-    code = []
-    for threadId, stack in sys._current_frames().items():
-        code.append("\n# Thread: %s(%d)" % (id2name[threadId], threadId))
-        for filename, lineno, name, line in traceback.extract_stack(stack):
-            code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
-            if line:
-                code.append("  %s" % (line.strip()))
-    logging.getLogger('dumpstacks').info("\n".join(code))
-
-for signum in SIGNALS:
-    signal.signal(signum, handler)
-
-if os.name == 'posix':
-    signal.signal(signal.SIGQUIT, dumpstacks)
-
-def quit():
-    netsvc.Agent.quit()
-    netsvc.Server.quitAll()
-    if tools.config['pidfile']:
-        os.unlink(tools.config['pidfile'])
-    logger = logging.getLogger('shutdown')
-    logger.info("Initiating OpenERP Server shutdown")
-    logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
-    logging.shutdown()
-
-    # manually join() all threads before calling sys.exit() to allow a second signal
-    # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
-    # threading.Thread.join() should not mask signals (at least in python 2.5)
-    for thread in threading.enumerate():
-        if thread != threading.currentThread() and not thread.isDaemon():
-            while thread.isAlive():
-                # need a busyloop here as thread.join() masks signals
-                # and would present the forced shutdown
-                thread.join(0.05)
-                time.sleep(0.05)
-    sys.exit(0)
-
-if tools.config['pidfile']:
-    fd = open(tools.config['pidfile'], 'w')
-    pidtext = "%d" % (os.getpid())
-    fd.write(pidtext)
-    fd.close()
-
-netsvc.Server.startAll()
-
-logger.info('OpenERP server is running, waiting for connections...')
-
-while netsvc.quit_signals_received == 0:
-    time.sleep(60)
-
-quit()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/addons/__init__.py'
--- openerp/addons/__init__.py	2011-02-08 13:27:19 +0000
+++ openerp/addons/__init__.py	2011-02-09 22:36:08 +0000
@@ -25,17 +25,17 @@
 import itertools
 import zipimport
 
-import openerp.osv as osv
-import openerp.tools as tools
-import openerp.tools.osutil as osutil
-from openerp.tools.safe_eval import safe_eval as eval
-import openerp.pooler as pooler
-from openerp.tools.translate import _
+import osv
+import tools
+import tools.osutil as osutil
+from tools.safe_eval import safe_eval as eval
+import pooler
+from tools.translate import _
 
-import openerp.netsvc as netsvc
+import netsvc
 
 import zipfile
-import openerp.release as release
+import release
 
 import re
 import base64
@@ -569,7 +569,7 @@
             a.update(b)
             return a
 
-        from openerp.tools.parse_version import parse_version
+        from tools.parse_version import parse_version
 
         parsed_installed_version = parse_version(pkg.installed_version or '')
         current_version = parse_version(convert_version(pkg.data.get('version', '0')))

=== modified file 'openerp/ir/ir.py'
--- openerp/ir/ir.py	2011-02-07 12:57:23 +0000
+++ openerp/ir/ir.py	2011-02-09 22:36:08 +0000
@@ -20,8 +20,8 @@
 ##############################################################################
 
 import pickle
-import openerp.osv as osv
-import openerp.pooler as pooler
+import osv
+import pooler
 
 def ir_set(cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None):
     obj = pooler.get_pool(cr.dbname).get('ir.values')

=== added file 'openerp/openerp-server.py'
--- openerp/openerp-server.py	1970-01-01 00:00:00 +0000
+++ openerp/openerp-server.py	2011-02-09 22:36:08 +0000
@@ -0,0 +1,258 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+"""
+OpenERP - Server
+OpenERP is an ERP+CRM program for small and medium businesses.
+
+The whole source code is distributed under the terms of the
+GNU Public Licence.
+
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
+"""
+
+#----------------------------------------------------------
+# python imports
+#----------------------------------------------------------
+import logging
+import os
+import signal
+import sys
+import threading
+import traceback
+
+import release
+__author__ = release.author
+__version__ = release.version
+
+if os.name == 'posix':
+    import pwd
+    # We DON't log this using the standard logger, because we might mess
+    # with the logfile's permissions. Just do a quick exit here.
+    if pwd.getpwuid(os.getuid())[0] == 'root' :
+        sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
+        sys.exit(1)
+
+#-----------------------------------------------------------------------
+# import the tools module so that the commandline parameters are parsed
+#-----------------------------------------------------------------------
+import tools
+tools.config.parse_config(sys.argv[1:])
+
+#----------------------------------------------------------
+# get logger
+#----------------------------------------------------------
+import netsvc
+netsvc.init_logger()
+logger = logging.getLogger('server')
+
+logger.info("OpenERP version - %s", release.version)
+for name, value in [('addons_path', tools.config['addons_path']),
+                    ('database hostname', tools.config['db_host'] or 'localhost'),
+                    ('database port', tools.config['db_port'] or '5432'),
+                    ('database user', tools.config['db_user'])]:
+    logger.info("%s - %s", name, value)
+
+# Don't allow if the connection to PostgreSQL done by postgres user
+if tools.config['db_user'] == 'postgres':
+    logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
+    sys.exit(1)
+
+import time
+
+#----------------------------------------------------------
+# init net service
+#----------------------------------------------------------
+logger.info('initialising distributed objects services')
+
+#---------------------------------------------------------------
+# connect to the database and initialize it with base if needed
+#---------------------------------------------------------------
+import pooler
+
+#----------------------------------------------------------
+# import basic modules
+#----------------------------------------------------------
+import osv
+import workflow
+import report
+import service
+
+#----------------------------------------------------------
+# import addons
+#----------------------------------------------------------
+
+import addons
+
+#----------------------------------------------------------
+# Load and update databases if requested
+#----------------------------------------------------------
+
+import service.http_server as service_http_server
+
+if not ( tools.config["stop_after_init"] or \
+    tools.config["translate_in"] or \
+    tools.config["translate_out"] ):
+    service_http_server.init_servers()
+    service_http_server.init_xmlrpc()
+    service_http_server.init_static_http()
+
+    import service.netrpc_server as service_netrpc_server
+    service_netrpc_server.init_servers()
+
+if tools.config['db_name']:
+    for dbname in tools.config['db_name'].split(','):
+        db,pool = pooler.get_db_and_pool(dbname, update_module=tools.config['init'] or tools.config['update'], pooljobs=False)
+        cr = db.cursor()
+
+        if tools.config["test_file"]:
+            logger.info('loading test file %s', tools.config["test_file"])
+            tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True)
+            cr.rollback()
+
+        pool.get('ir.cron')._poolJobs(db.dbname)
+
+        cr.close()
+
+#----------------------------------------------------------
+# translation stuff
+#----------------------------------------------------------
+if tools.config["translate_out"]:
+    import csv
+
+    if tools.config["language"]:
+        msg = "language %s" % (tools.config["language"],)
+    else:
+        msg = "new language"
+    logger.info('writing translation file for %s to %s', msg, tools.config["translate_out"])
+
+    fileformat = os.path.splitext(tools.config["translate_out"])[-1][1:].lower()
+    buf = file(tools.config["translate_out"], "w")
+    dbname = tools.config['db_name']
+    cr = pooler.get_db(dbname).cursor()
+    tools.trans_export(tools.config["language"], tools.config["translate_modules"] or ["all"], buf, fileformat, cr)
+    cr.close()
+    buf.close()
+
+    logger.info('translation file written successfully')
+    sys.exit(0)
+
+if tools.config["translate_in"]:
+    context = {'overwrite': tools.config["overwrite_existing_translations"]}
+    dbname = tools.config['db_name']
+    cr = pooler.get_db(dbname).cursor()
+    tools.trans_load(cr,
+                     tools.config["translate_in"], 
+                     tools.config["language"],
+                     context=context)
+    tools.trans_update_res_ids(cr)
+    cr.commit()
+    cr.close()
+    sys.exit(0)
+
+#----------------------------------------------------------------------------------
+# if we don't want the server to continue to run after initialization, we quit here
+#----------------------------------------------------------------------------------
+if tools.config["stop_after_init"]:
+    sys.exit(0)
+
+
+#----------------------------------------------------------
+# Launch Servers
+#----------------------------------------------------------
+
+LST_SIGNALS = ['SIGINT', 'SIGTERM']
+
+SIGNALS = dict(
+    [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
+)
+
+netsvc.quit_signals_received = 0
+
+def handler(signum, frame):
+    """
+    :param signum: the signal number
+    :param frame: the interrupted stack frame or None
+    """
+    netsvc.quit_signals_received += 1
+    if netsvc.quit_signals_received > 1:
+        sys.stderr.write("Forced shutdown.\n")
+        os._exit(0)
+
+def dumpstacks(signum, frame):
+    # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
+    # modified for python 2.5 compatibility
+    thread_map = dict(threading._active, **threading._limbo)
+    id2name = dict([(threadId, thread.getName()) for threadId, thread in thread_map.items()])
+    code = []
+    for threadId, stack in sys._current_frames().items():
+        code.append("\n# Thread: %s(%d)" % (id2name[threadId], threadId))
+        for filename, lineno, name, line in traceback.extract_stack(stack):
+            code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
+            if line:
+                code.append("  %s" % (line.strip()))
+    logging.getLogger('dumpstacks').info("\n".join(code))
+
+for signum in SIGNALS:
+    signal.signal(signum, handler)
+
+if os.name == 'posix':
+    signal.signal(signal.SIGQUIT, dumpstacks)
+
+def quit():
+    netsvc.Agent.quit()
+    netsvc.Server.quitAll()
+    if tools.config['pidfile']:
+        os.unlink(tools.config['pidfile'])
+    logger = logging.getLogger('shutdown')
+    logger.info("Initiating OpenERP Server shutdown")
+    logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
+    logging.shutdown()
+
+    # manually join() all threads before calling sys.exit() to allow a second signal
+    # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
+    # threading.Thread.join() should not mask signals (at least in python 2.5)
+    for thread in threading.enumerate():
+        if thread != threading.currentThread() and not thread.isDaemon():
+            while thread.isAlive():
+                # need a busyloop here as thread.join() masks signals
+                # and would present the forced shutdown
+                thread.join(0.05)
+                time.sleep(0.05)
+    sys.exit(0)
+
+if tools.config['pidfile']:
+    fd = open(tools.config['pidfile'], 'w')
+    pidtext = "%d" % (os.getpid())
+    fd.write(pidtext)
+    fd.close()
+
+netsvc.Server.startAll()
+
+logger.info('OpenERP server is running, waiting for connections...')
+
+while netsvc.quit_signals_received == 0:
+    time.sleep(60)
+
+quit()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2011-02-07 12:57:23 +0000
+++ openerp/osv/expression.py	2011-02-09 22:36:08 +0000
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-from openerp.tools import flatten, reverse_enumerate
+from tools import flatten, reverse_enumerate
 import fields
 
 

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2011-02-07 12:57:23 +0000
+++ openerp/osv/fields.py	2011-02-09 22:36:08 +0000
@@ -38,9 +38,9 @@
 import xmlrpclib
 from psycopg2 import Binary
 
-import openerp.netsvc as netsvc
-import openerp.tools as tools
-from openerp.tools.translate import _
+import netsvc
+import tools
+from tools.translate import _
 
 def _symbol_set(symb):
     if symb == None or symb == False:

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2011-02-08 16:49:23 +0000
+++ openerp/osv/orm.py	2011-02-09 22:36:08 +0000
@@ -49,18 +49,18 @@
 import traceback
 import types
 
-import openerp.netsvc as netsvc
+import netsvc
 from lxml import etree
-from openerp.tools.config import config
-from openerp.tools.translate import _
+from tools.config import config
+from tools.translate import _
 
 import fields
 from query import Query
-import openerp.tools as tools
-from openerp.tools.safe_eval import safe_eval as eval
+import tools
+from tools.safe_eval import safe_eval as eval
 
 # List of etree._Element subclasses that we choose to ignore when parsing XML.
-from openerp.tools import SKIPPED_ELEMENT_TYPES
+from tools import SKIPPED_ELEMENT_TYPES
 
 regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I)
 

=== modified file 'openerp/osv/osv.py'
--- openerp/osv/osv.py	2011-02-07 12:57:23 +0000
+++ openerp/osv/osv.py	2011-02-09 22:36:08 +0000
@@ -24,13 +24,13 @@
 #
 
 import orm
-import openerp.netsvc as netsvc
-import openerp.pooler as pooler
+import netsvc
+import pooler
 import copy
 import logging
 from psycopg2 import IntegrityError, errorcodes
-from openerp.tools.func import wraps
-from openerp.tools.translate import translate
+from tools.func import wraps
+from tools.translate import translate
 
 module_list = []
 module_class_list = {}

=== modified file 'openerp/pooler.py'
--- openerp/pooler.py	2011-02-07 12:57:23 +0000
+++ openerp/pooler.py	2011-02-09 22:36:08 +0000
@@ -30,8 +30,8 @@
     if db_name in pool_dic:
         pool = pool_dic[db_name]
     else:
-        import openerp.addons as addons
-        import openerp.osv.osv as osv_osv
+        import addons
+        import osv.osv as osv_osv
         pool = osv_osv.osv_pool()
         pool_dic[db_name] = pool
 
@@ -65,8 +65,8 @@
     # do not put this import outside this function
     # sql_db must not be loaded before the logger is initialized.
     # sql_db import psycopg2.tool which create a default logger if there is not.
-    # this resulting of having the logs outputed twice...
-    import openerp.sql_db as sql_db
+    # this resulting of having the logs output twice...
+    import sql_db
     db = sql_db.db_connect(db_name)
     return db
 

=== modified file 'openerp/report/__init__.py'
--- openerp/report/__init__.py	2011-02-07 12:57:23 +0000
+++ openerp/report/__init__.py	2011-02-09 22:36:08 +0000
@@ -24,7 +24,7 @@
 import print_fnc
 import custom
 import render
-import openerp.pychart
+import pychart
 import int_to_text
 
 import report_sxw

=== modified file 'openerp/report/custom.py'
--- openerp/report/custom.py	2011-02-07 12:57:23 +0000
+++ openerp/report/custom.py	2011-02-09 22:36:08 +0000
@@ -21,23 +21,23 @@
 
 import os
 import time
-import openerp.netsvc as netsvc
+import netsvc
 
-import openerp.tools as tools
-from openerp.tools.safe_eval import safe_eval as eval
+import tools
+from tools.safe_eval import safe_eval as eval
 import print_xml
 import render
 from interface import report_int
 import common
-from openerp.osv.osv import except_osv
-from openerp.osv.orm import browse_null
-from openerp.osv.orm import browse_record_list
-import openerp.pooler as pooler
+from osv.osv import except_osv
+from osv.orm import browse_null
+from osv.orm import browse_record_list
+import pooler
 from pychart import *
 import misc
 import cStringIO
 from lxml import etree
-from openerp.tools.translate import _
+from tools.translate import _
 
 class external_pdf(render.render):
     def __init__(self, pdf):

=== modified file 'openerp/report/interface.py'
--- openerp/report/interface.py	2011-02-07 12:57:23 +0000
+++ openerp/report/interface.py	2011-02-09 22:36:08 +0000
@@ -23,11 +23,11 @@
 import re
 
 from lxml import etree
-import openerp.netsvc as netsvc
-import openerp.pooler as pooler
+import netsvc
+import pooler
 
-import openerp.tools as tools
-import openerp.addons as addons
+import tools
+import addons
 import print_xml
 import render
 import urllib

=== modified file 'openerp/report/print_xml.py'
--- openerp/report/print_xml.py	2011-02-07 12:57:23 +0000
+++ openerp/report/print_xml.py	2011-02-09 22:36:08 +0000
@@ -21,13 +21,13 @@
 
 import os,types
 from lxml import etree
-import openerp.netsvc as netsvc
-import openerp.tools as tools
-from openerp.tools.safe_eval import safe_eval
+import netsvc
+import tools
+from tools.safe_eval import safe_eval
 import print_fnc
 import copy
-from openerp.osv.orm import browse_null, browse_record
-import openerp.pooler as pooler
+from osv.orm import browse_null, browse_record
+import pooler as pooler
 
 class InheritDict(dict):
     # Might be usefull when we're doing name lookup for call or eval.

=== modified file 'openerp/report/printscreen/ps_form.py'
--- openerp/report/printscreen/ps_form.py	2011-02-07 12:57:23 +0000
+++ openerp/report/printscreen/ps_form.py	2011-02-09 22:36:08 +0000
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.report.interface import report_int
-import openerp.pooler as pooler
-import openerp.tools as tools
+from report.interface import report_int
+import pooler
+import tools
 
-from openerp.report import render
+from report import render
 from lxml import etree
 
 import time, os

=== modified file 'openerp/report/printscreen/ps_list.py'
--- openerp/report/printscreen/ps_list.py	2011-02-07 12:57:23 +0000
+++ openerp/report/printscreen/ps_list.py	2011-02-09 22:36:08 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.report.interface import report_int
-import openerp.pooler as pooler
-import openerp.tools as tools
-from openerp.tools.safe_eval import safe_eval as eval
+from report.interface import report_int
+import pooler
+import tools
+from tools.safe_eval import safe_eval as eval
 from lxml  import etree
-from openerp.report import render, report_sxw
+from report import render, report_sxw
 import locale
 
 import time, os

=== modified file 'openerp/report/render/html2html/html2html.py'
--- openerp/report/render/html2html/html2html.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/html2html/html2html.py	2011-02-09 22:36:08 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.report.render.rml2pdf import utils
+from report.render.rml2pdf import utils
 from lxml import etree
 import copy
-import openerp.pooler  as pooler
+import pooler
 import base64
 import cStringIO
 import re

=== modified file 'openerp/report/render/makohtml2html/makohtml2html.py'
--- openerp/report/render/makohtml2html/makohtml2html.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/makohtml2html/makohtml2html.py	2011-02-09 22:36:08 +0000
@@ -22,7 +22,7 @@
 from lxml import etree
 from mako.template import Template
 from mako.lookup import TemplateLookup
-import openerp.netsvc as netsvc
+import netsvc
 import traceback, sys, os
 
 class makohtml2html(object):

=== modified file 'openerp/report/render/odt2odt/odt2odt.py'
--- openerp/report/render/odt2odt/odt2odt.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/odt2odt/odt2odt.py	2011-02-09 22:36:08 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.report.render.rml2pdf import utils
+from report.render.rml2pdf import utils
 from lxml import etree
 import copy
 

=== modified file 'openerp/report/render/rml2html/rml2html.py'
--- openerp/report/render/rml2html/rml2html.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/rml2html/rml2html.py	2011-02-09 22:36:08 +0000
@@ -40,7 +40,7 @@
 from lxml import etree
 import copy
 import utils
-from openerp.report.render.rml2pdf import utils
+from report.render.rml2pdf import utils
 
 class _flowable(object):
     def __init__(self, template, doc, localcontext = None):

=== modified file 'openerp/report/render/rml2pdf/customfonts.py'
--- openerp/report/render/rml2pdf/customfonts.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/rml2pdf/customfonts.py	2011-02-09 22:36:08 +0000
@@ -26,7 +26,7 @@
 import platform
 from reportlab import rl_config
 
-from openerp.tools import config
+from tools import config
 
 """This module allows the mapping of some system-available TTF fonts to
 the reportlab engine.

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2011-02-09 22:36:08 +0000
@@ -33,9 +33,9 @@
 from lxml import etree
 import base64
 from reportlab.platypus.doctemplate import ActionFlowable
-from openerp.tools.safe_eval import safe_eval as eval
+from tools.safe_eval import safe_eval as eval
 from reportlab.lib.units import inch,cm,mm
-from openerp.tools.misc import file_open
+from tools.misc import file_open
 from reportlab.pdfbase import pdfmetrics
 
 try:

=== modified file 'openerp/report/render/rml2pdf/utils.py'
--- openerp/report/render/rml2pdf/utils.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/rml2pdf/utils.py	2011-02-09 22:36:08 +0000
@@ -43,9 +43,9 @@
 import re
 import reportlab
 
-import openerp.tools as tools
-from openerp.tools.safe_eval import safe_eval as eval
-from openerp.tools.misc import ustr
+import tools
+from tools.safe_eval import safe_eval as eval
+from tools.misc import ustr
 
 _regex = re.compile('\[\[(.+?)\]\]')
 

=== modified file 'openerp/report/render/rml2txt/utils.py'
--- openerp/report/render/rml2txt/utils.py	2011-02-07 12:57:23 +0000
+++ openerp/report/render/rml2txt/utils.py	2011-02-09 22:36:08 +0000
@@ -23,7 +23,7 @@
 import reportlab
 import reportlab.lib.units
 from lxml import etree
-from openerp.tools.safe_eval import safe_eval as eval
+from tools.safe_eval import safe_eval as eval
 
 _regex = re.compile('\[\[(.+?)\]\]')
 

=== modified file 'openerp/report/report_sxw.py'
--- openerp/report/report_sxw.py	2011-02-07 12:57:23 +0000
+++ openerp/report/report_sxw.py	2011-02-09 22:36:08 +0000
@@ -29,12 +29,12 @@
 from interface import report_rml
 import preprocess
 import logging
-import openerp.pooler as pooler
-import openerp.tools as tools
+import pooler
+import tools
 import zipfile
 import common
-from openerp.osv.fields import float as float_class, function as function_class
-from openerp.osv.orm import browse_record
+from osv.fields import float as float_class, function as function_class
+from osv.orm import browse_record
 
 DT_FORMAT = '%Y-%m-%d'
 DHM_FORMAT = '%Y-%m-%d %H:%M:%S'

=== modified file 'openerp/service/http_server.py'
--- openerp/service/http_server.py	2011-02-07 12:57:23 +0000
+++ openerp/service/http_server.py	2011-02-09 22:36:08 +0000
@@ -31,10 +31,10 @@
 
 """
 from websrv_lib import *
-import openerp.netsvc as netsvc
+import netsvc
 import errno
 import threading
-import openerp.tools as tools
+import tools
 import posixpath
 import urllib
 import os

=== modified file 'openerp/service/netrpc_server.py'
--- openerp/service/netrpc_server.py	2011-02-07 12:57:23 +0000
+++ openerp/service/netrpc_server.py	2011-02-09 22:36:08 +0000
@@ -30,9 +30,9 @@
 import threading
 import traceback
 
-import openerp.netsvc as netsvc
-import openerp.tiny_socket as tiny_socket
-import openerp.tools as tools
+import netsvc
+import tiny_socket
+import tools
 
 class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
     def __init__(self, sock, threads):

=== modified file 'openerp/service/security.py'
--- openerp/service/security.py	2011-02-07 12:57:23 +0000
+++ openerp/service/security.py	2011-02-09 22:36:08 +0000
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-import openerp.pooler as pooler
-import openerp.tools as tools
+import pooler
+import tools
 
 # When rejecting a password, hide the traceback
 class ExceptionNoTb(Exception):

=== modified file 'openerp/service/web_services.py'
--- openerp/service/web_services.py	2011-02-07 12:57:23 +0000
+++ openerp/service/web_services.py	2011-02-09 22:36:08 +0000
@@ -27,14 +27,14 @@
 import time
 import sys
 import platform
-from openerp.tools.translate import _
-import openerp.addons as addons
-import openerp.ir
-import openerp.netsvc as netsvc
-import openerp.pooler as pooler
-import openerp.release as release
-import openerp.sql_db as sql_db
-import openerp.tools as tools
+from tools.translate import _
+import addons
+import ir
+import netsvc
+import pooler
+import release
+import sql_db
+import tools
 import locale
 import logging
 from cStringIO import StringIO
@@ -327,8 +327,8 @@
 
     def exp_migrate_databases(self,databases):
 
-        from openerp.osv.orm import except_orm
-        from openerp.osv.osv import except_osv
+        from osv.orm import except_orm
+        from osv.osv import except_osv
 
         l = netsvc.Logger()
         for db in databases:
@@ -441,7 +441,7 @@
         return tools.misc.get_server_timezone()
 
     def exp_get_available_updates(self, contract_id, contract_password):
-        import openerp.tools.maintenance as tm
+        import tools.maintenance as tm
         try:
             rc = tm.remote_contract(contract_id, contract_password)
             if not rc.id:
@@ -455,7 +455,7 @@
 
     def exp_get_migration_scripts(self, contract_id, contract_password):
         l = netsvc.Logger()
-        import openerp.tools.maintenance as tm
+        import tools.maintenance as tm
         try:
             rc = tm.remote_contract(contract_id, contract_password)
             if not rc.id:

=== modified file 'openerp/test/test_osv.py'
--- openerp/test/test_osv.py	2011-02-07 12:57:23 +0000
+++ openerp/test/test_osv.py	2011-02-09 22:36:08 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import unittest
-from openerp.osv.query import Query
+from osv.query import Query
 
 class QueryTestCase(unittest.TestCase):
 

=== modified file 'openerp/test/test_translate.py'
--- openerp/test/test_translate.py	2011-02-07 12:57:23 +0000
+++ openerp/test/test_translate.py	2011-02-09 22:36:08 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import unittest
-from openerp.tools.translate import quote, unquote
+from tools.translate import quote, unquote
 
 class TranslationToolsTestCase(unittest.TestCase):
 

=== modified file 'openerp/tools/amount_to_text_en.py'
--- openerp/tools/amount_to_text_en.py	2011-02-07 12:57:23 +0000
+++ openerp/tools/amount_to_text_en.py	2011-02-09 22:36:08 +0000
@@ -99,7 +99,7 @@
     Example:
         1654: thousands six cent cinquante-quatre.
     """
-    import openerp.loglevels as loglevels
+    import loglevels
 #    if nbr > 10000000:
 #        netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("Number too large '%d', can not translate it"))
 #        return str(nbr)

=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py	2011-02-08 17:09:27 +0000
+++ openerp/tools/config.py	2011-02-09 22:36:08 +0000
@@ -23,10 +23,9 @@
 import optparse
 import os
 import sys
-import openerp
-import openerp.loglevels as loglevels
+import loglevels
 import logging
-import openerp.release as release
+import release
 
 def check_ssl():
     try:
@@ -334,7 +333,7 @@
         else:
             self.options['log_level'] = self._LOGLEVELS.get(self.options['log_level']) or int(self.options['log_level'])
 
-        self.options['root_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(os.path.dirname(openerp.__file__))))
+        self.options['root_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(os.path.dirname(__file__))))
         if not self.options['addons_path'] or self.options['addons_path']=='None':
             self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
         else:

=== modified file 'openerp/tools/convert.py'
--- openerp/tools/convert.py	2011-02-07 12:57:23 +0000
+++ openerp/tools/convert.py	2011-02-09 22:36:08 +0000
@@ -28,7 +28,7 @@
 
 # for eval context:
 import time
-import openerp.release as release
+import release
 try:
     import pytz
 except:
@@ -41,8 +41,8 @@
 from datetime import datetime, timedelta
 from lxml import etree
 import misc
-import openerp.loglevels as loglevels
-import openerp.pooler as pooler
+import loglevels
+import pooler
 from config import config
 from translate import _
 from yaml_import import convert_yaml_import
@@ -540,7 +540,7 @@
             id = _eval_xml(self, rec[0], self.pool, cr, self.uid, self.idref)
 
         uid = self.get_uid(cr, self.uid, data_node, rec)
-        import openerp.netsvc as netsvc
+        import netsvc
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, model,
             id,
@@ -825,7 +825,7 @@
             else:
                 f_val = _eval_xml(self,field, self.pool, cr, self.uid, self.idref)
                 if model._columns.has_key(f_name):
-                    import openerp.osv as osv
+                    import osv
                     if isinstance(model._columns[f_name], osv.fields.integer):
                         f_val = int(f_val)
             res[f_name] = f_val

=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py	2011-02-08 09:24:58 +0000
+++ openerp/tools/misc.py	2011-02-09 22:36:08 +0000
@@ -55,13 +55,13 @@
 except ImportError:
     html2text = None
 
-import openerp.loglevels as loglevels
+import loglevels
 from config import config
 from lru import LRU
 
 # get_encodings, ustr and exception_to_unicode were originally from tools.misc.
 # There are moved to loglevels until we refactor tools.
-from openerp.loglevels import get_encodings, ustr, exception_to_unicode
+from loglevels import get_encodings, ustr, exception_to_unicode
 
 _logger = logging.getLogger('tools')
 
@@ -71,7 +71,7 @@
 
 # initialize a database with base/base.sql
 def init_db(cr):
-    import openerp.addons as addons
+    import addons as addons
     f = addons.get_module_resource('base', 'base.sql')
     base_sql_file = file_open(f)
     try:
@@ -204,7 +204,7 @@
 
     @return: fileobject if pathinfo is False else (fileobject, filepath)
     """
-    import openerp.addons as addons
+    import addons
     adps = addons.ad_paths
     rtp = os.path.normcase(os.path.abspath(config['root_path']))
 

=== modified file 'openerp/tools/test_reports.py'
--- openerp/tools/test_reports.py	2011-02-07 12:57:23 +0000
+++ openerp/tools/test_reports.py	2011-02-09 22:36:08 +0000
@@ -25,11 +25,11 @@
     through the code of yaml tests.
 """
 
-import openerp.netsvc as netsvc
-import openerp.tools as tools
+import netsvc
+import tools
 import logging
-import openerp.pooler as pooler
-from openerp.tools.safe_eval import safe_eval
+import pooler
+from tools.safe_eval import safe_eval
 from subprocess import Popen, PIPE
 import os
 import tempfile

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2011-02-09 09:02:31 +0000
+++ openerp/tools/translate.py	2011-02-09 22:36:08 +0000
@@ -26,7 +26,7 @@
 import itertools
 import locale
 import os
-import openerp.pooler as pooler
+import pooler
 import re
 import logging
 import tarfile
@@ -354,7 +354,7 @@
         return type, name, res_id, source, trad
 
     def write_infos(self, modules):
-        import openerp.release as release
+        import release
         self.buffer.write("# Translation of %(project)s.\n" \
                           "# This file contains the translation of the following modules:\n" \
                           "%(modules)s" \
@@ -588,7 +588,7 @@
                 push_translation(module, 'view', encode(obj.model), 0, t)
         elif model=='ir.actions.wizard':
             service_name = 'wizard.'+encode(obj.wiz_name)
-            import openerp.netsvc as netsvc
+            import netsvc
             if netsvc.Service._services.get(service_name):
                 obj2 = netsvc.Service._services[service_name]
                 for state_name, state_def in obj2.states.iteritems():

=== modified file 'openerp/tools/yaml_import.py'
--- openerp/tools/yaml_import.py	2011-02-07 12:57:23 +0000
+++ openerp/tools/yaml_import.py	2011-02-09 22:36:08 +0000
@@ -4,7 +4,7 @@
 from datetime import datetime, timedelta
 import logging
 
-import openerp.pooler as pooler
+import pooler
 import misc
 from config import config
 import yaml_tag
@@ -296,7 +296,7 @@
         return record_dict
 
     def process_record(self, node):
-        import openerp.osv as osv
+        import osv
         record, fields = node.items()[0]
         model = self.get_model(record.model)
         if isinstance(model, osv.osv.osv_memory):
@@ -447,7 +447,7 @@
         signals=[x['signal'] for x in self.cr.dictfetchall()]
         if workflow.action not in signals:
             raise YamlImportException('Incorrect action %s. No such action defined' % workflow.action)
-        import openerp.netsvc as netsvc
+        import netsvc
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
     

=== modified file 'openerp/wizard/__init__.py'
--- openerp/wizard/__init__.py	2011-02-07 12:57:23 +0000
+++ openerp/wizard/__init__.py	2011-02-09 22:36:08 +0000
@@ -19,18 +19,18 @@
 #
 ##############################################################################
 
-import openerp.netsvc as netsvc
-from openerp.tools import copy
-from openerp.tools.misc import UpdateableStr, UpdateableDict
-from openerp.tools.translate import translate
+import netsvc
+from tools import copy
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import translate
 from lxml import etree
 
-import openerp.ir as ir
-import openerp.pooler as pooler
+import ir
+import pooler
 
-from openerp.osv.osv import except_osv
-from openerp.osv.orm import except_orm
-from openerp.netsvc import Logger, LOG_ERROR
+from osv.osv import except_osv
+from osv.orm import except_orm
+from netsvc import Logger, LOG_ERROR
 import sys
 
 class except_wizard(Exception):

=== modified file 'openerp/workflow/instance.py'
--- openerp/workflow/instance.py	2011-02-07 12:57:23 +0000
+++ openerp/workflow/instance.py	2011-02-09 22:36:08 +0000
@@ -22,8 +22,8 @@
 import wkf_logs
 import workitem
 
-import openerp.netsvc as netsvc
-import openerp.pooler as pooler
+import netsvc
+import pooler
 
 def create(cr, ident, wkf_id):
     (uid,res_type,res_id) = ident

=== modified file 'openerp/workflow/wkf_expr.py'
--- openerp/workflow/wkf_expr.py	2011-02-07 12:57:23 +0000
+++ openerp/workflow/wkf_expr.py	2011-02-09 22:36:08 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import sys
-import openerp.netsvc as netsvc
-import openerp.osv as base
-import openerp.pooler as pooler
-from openerp.tools.safe_eval import safe_eval as eval
+import netsvc
+import osv as base
+import pooler
+from tools.safe_eval import safe_eval as eval
 
 class Env(dict):
     def __init__(self, cr, uid, model, ids):

=== modified file 'openerp/workflow/wkf_logs.py'
--- openerp/workflow/wkf_logs.py	2011-02-07 12:57:23 +0000
+++ openerp/workflow/wkf_logs.py	2011-02-09 22:36:08 +0000
@@ -22,7 +22,7 @@
 #
 # May be uncommented to logs workflows modifications
 #
-import openerp.netsvc as netsvc
+import netsvc
 
 def log(cr,ident,act_id,info=''):
     return 

=== modified file 'openerp/workflow/wkf_service.py'
--- openerp/workflow/wkf_service.py	2011-02-07 12:57:23 +0000
+++ openerp/workflow/wkf_service.py	2011-02-09 22:36:08 +0000
@@ -23,8 +23,8 @@
 import workitem
 import instance
 
-import openerp.netsvc as netsvc
-import openerp.pooler as pooler
+import netsvc
+import pooler
 
 class workflow_service(netsvc.Service):
     def __init__(self, name='workflow', audience='*'):

=== modified file 'openerp/workflow/workitem.py'
--- openerp/workflow/workitem.py	2011-02-07 12:57:23 +0000
+++ openerp/workflow/workitem.py	2011-02-09 22:36:08 +0000
@@ -24,7 +24,7 @@
 # cr.execute('delete from wkf_triggers where model=%s and res_id=%s', (res_type,res_id))
 #
 
-import openerp.netsvc as netsvc
+import netsvc
 import instance
 
 import wkf_expr

=== modified file 'setup.cfg'
--- setup.cfg	2010-10-18 22:00:03 +0000
+++ setup.cfg	2011-02-09 22:36:08 +0000
@@ -7,8 +7,8 @@
 formats=rpm
 
 [bdist_rpm]
-# release must exactly match 'release' as set in bin/release.py
-release=6.0.0-rc1
+# release must exactly match 'release' as set in openerp/release.py
+release=6.1-dev
 
 requires=python >= 2.5
 #build-requires=python-devel >= 2.3

=== modified file 'setup.py'
--- setup.py	2011-02-03 23:00:23 +0000
+++ setup.py	2011-02-09 22:36:08 +0000
@@ -42,9 +42,9 @@
     import py2exe
     has_py2exe = True
 
-sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin"))
+sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "openerp"))
 
-execfile(join('bin', 'release.py'))
+execfile(join('openerp', 'release.py'))
 
 if 'bdist_rpm' in sys.argv:
     version = version.split('-')[0]
@@ -85,7 +85,7 @@
     os.walk = walk_followlinks
 
 def find_addons():
-    for root, _, names in os.walk(join('bin', 'addons'), followlinks=True):
+    for root, _, names in os.walk(join('openerp', 'addons'), followlinks=True):
         if '__openerp__.py' in names or '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
@@ -111,9 +111,9 @@
     '''Build list of data files to be installed'''
     files = []
     if os.name == 'nt':
-        os.chdir('bin')
+        os.chdir('openerp')
         for (dp, dn, names) in os.walk('addons'):
-            files.append((dp, map(lambda x: join('bin', dp, x), names)))
+            files.append((dp, map(lambda x: join('openerp', dp, x), names)))
         os.chdir('..')
         #for root, _, names in os.walk(join('bin','addons')):
         #    files.append((root, [join(root, name) for name in names]))
@@ -121,7 +121,7 @@
             files.append((root, [join(root, name) for name in names]))
         #for root, _, names in os.walk('pixmaps'):
         #    files.append((root, [join(root, name) for name in names]))
-        files.append(('.', [join('bin', 'import_xml.rng'),]))
+        files.append(('.', [join('openerp', 'import_xml.rng'),]))
     else:
         man_directory = join('share', 'man')
         files.append((join(man_directory, 'man1'), ['man/openerp-server.1']))
@@ -136,7 +136,7 @@
 
         openerp_site_packages = join(get_python_lib(prefix=''), 'openerp-server')
 
-        files.append((openerp_site_packages, [join('bin', 'import_xml.rng'),]))
+        files.append((openerp_site_packages, [join('openerp', 'import_xml.rng'),]))
 
         if sys.version_info[0:2] == (2,5):
             files.append((openerp_site_packages, [ join('python25-compat','BaseHTTPServer.py'),
@@ -163,7 +163,7 @@
 f.close()
 
 def find_package_dirs():
-    package_dirs = {'openerp-server': 'bin'}
+    package_dirs = {'openerp-server': 'openerp'}
     for mod, path in find_addons():
         package_dirs['openerp-server.addons.' + mod] = path
     return package_dirs
@@ -224,8 +224,8 @@
       package_dir      = find_package_dirs(),
       console = [
           {
-              "script": join("bin", "openerp-server.py"),
-              "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))]
+              "script": join("openerp","openerp-server.py"),
+              "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))],
           }
       ],
       options = options,
@@ -241,7 +241,7 @@
           'caldav',
           'pyyaml',
           'pywebdav',
-          'feedparser',
+          'feedparser',	
       ],
       extras_require={
           'SSL' : ['pyopenssl'],