# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: donkirkby@gmail.com-20100122235845-bzcbce28g25vwolm
# target_branch: lp:~openerp/openobject-server/5.0/
# testament_sha1: 7797d2b7d82940d04629beaf3f0e4f9826831c16
# timestamp: 2010-01-22 15:59:18 -0800
# base_revision_id: jvo@tinyerp.com-20100122143908-7qxkxrmc5gcuwlq3
# 
# Begin patch
=== modified file 'setup.py'
--- setup.py	2009-11-28 10:01:04 +0000
+++ setup.py	2010-01-22 23:58:45 +0000
@@ -102,7 +102,11 @@
         files.append((opj(doc_directory, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)]))
         files.append((opj(doc_directory, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)]))
 
-        openerp_site_packages = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server')
+        openerp_site_packages = opj(
+            'lib',
+            'python%s' % py_short_version,
+            ('site-packages' if py_short_version < '2.6' else 'dist-packages'),
+            'openerp-server')
 
         files.append((openerp_site_packages, [opj('bin', 'import_xml.rng'),
                                               opj('bin', 'server.pkey'),
@@ -111,7 +115,11 @@
         for addon in find_addons():
             addonname = addon.split('.')[-1]
             add_path = addon.replace('.', os.path.sep).replace('openerp-server', 'bin', 1)
-            addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', add_path.replace('bin', 'openerp-server', 1))
+            addon_path = opj(
+                'lib', 
+                'python%s' % py_short_version, 
+                ('site-packages' if py_short_version < '2.6' else 'dist-packages'),
+                add_path.replace('bin', 'openerp-server', 1))
             pathfiles = []
             for root, dirs, innerfiles in os.walk(add_path):
                 innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles)

# Begin bundle
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
ixZBqDg/ZkbaRwCtiP/i7kinChISSB7aYA==