Move source code from ./telepathy to ./src - it's not usable until the generated bits have been compiled anyway, and with the source in ./telepathy, 'PYTHONPATH=$PWD/build/lib python -c "import telepathy"' won't work

20070926125612-53eee-cc758b8244e0c0e9b445551035bea5f424d75cfc.gz

22 files changed, 2 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index f71095b..074b0c3 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ from distutils.spawn import spawn
 # can't import telepathy._version because that imports telepathy,
 # which needs telepathy._generated, which we haven't yet built...
 loc = {}
-execfile(os.path.join(os.curdir, 'telepathy', '_version.py'),
+execfile(os.path.join(os.curdir, 'src', '_version.py'),
          globals(), loc)
 __version__ = loc['__version__']
 
@@ -207,6 +207,7 @@ setup(
               'build_gen_py_ifaces': build_gen_py_ifaces},
     name='telepathy-python',
     version=__version__,
+    package_dir={'telepathy': 'src'},
     packages=[
         'telepathy',
         'telepathy.client',
diff --git a/telepathy/.git-darcs-dir b/src/.git-darcs-dir
index e69de29..e69de29 100644
--- a/telepathy/.git-darcs-dir
+++ b/src/.git-darcs-dir
diff --git a/telepathy/__init__.py b/src/__init__.py
index ba4b424..ba4b424 100644
--- a/telepathy/__init__.py
+++ b/src/__init__.py
diff --git a/telepathy/_version.py b/src/_version.py
index 5cf17d2..5cf17d2 100644
--- a/telepathy/_version.py
+++ b/src/_version.py
diff --git a/telepathy/client/.git-darcs-dir b/src/client/.git-darcs-dir
index e69de29..e69de29 100644
--- a/telepathy/client/.git-darcs-dir
+++ b/src/client/.git-darcs-dir
diff --git a/telepathy/client/__init__.py b/src/client/__init__.py
index ee0d5bd..ee0d5bd 100644
--- a/telepathy/client/__init__.py
+++ b/src/client/__init__.py
diff --git a/telepathy/client/channel.py b/src/client/channel.py
index 6cb89be..6cb89be 100644
--- a/telepathy/client/channel.py
+++ b/src/client/channel.py
diff --git a/telepathy/client/conn.py b/src/client/conn.py
index b103cfd..b103cfd 100644
--- a/telepathy/client/conn.py
+++ b/src/client/conn.py
diff --git a/telepathy/client/connmgr.py b/src/client/connmgr.py
index 3c5d64d..3c5d64d 100644
--- a/telepathy/client/connmgr.py
+++ b/src/client/connmgr.py
diff --git a/telepathy/client/interfacefactory.py b/src/client/interfacefactory.py
index ff0be19..ff0be19 100644
--- a/telepathy/client/interfacefactory.py
+++ b/src/client/interfacefactory.py
diff --git a/telepathy/client/managerregistry.py b/src/client/managerregistry.py
index 1ca00f0..1ca00f0 100644
--- a/telepathy/client/managerregistry.py
+++ b/src/client/managerregistry.py
diff --git a/telepathy/constants.py b/src/constants.py
index 45bceaa..45bceaa 100644
--- a/telepathy/constants.py
+++ b/src/constants.py
diff --git a/telepathy/errors.py b/src/errors.py
index 7ada097..7ada097 100644
--- a/telepathy/errors.py
+++ b/src/errors.py
diff --git a/telepathy/interfaces.py b/src/interfaces.py
index 36a1350..36a1350 100644
--- a/telepathy/interfaces.py
+++ b/src/interfaces.py
diff --git a/telepathy/server/.git-darcs-dir b/src/server/.git-darcs-dir
index e69de29..e69de29 100644
--- a/telepathy/server/.git-darcs-dir
+++ b/src/server/.git-darcs-dir
diff --git a/telepathy/server/__init__.py b/src/server/__init__.py
index e7cdacb..e7cdacb 100644
--- a/telepathy/server/__init__.py
+++ b/src/server/__init__.py
diff --git a/telepathy/server/channel.py b/src/server/channel.py
index d88969a..d88969a 100644
--- a/telepathy/server/channel.py
+++ b/src/server/channel.py
diff --git a/telepathy/server/conn.py b/src/server/conn.py
index 8973ce2..8973ce2 100644
--- a/telepathy/server/conn.py
+++ b/src/server/conn.py
diff --git a/telepathy/server/connmgr.py b/src/server/connmgr.py
index 66141da..66141da 100644
--- a/telepathy/server/connmgr.py
+++ b/src/server/connmgr.py
diff --git a/telepathy/server/handle.py b/src/server/handle.py
index ba9202d..ba9202d 100644
--- a/telepathy/server/handle.py
+++ b/src/server/handle.py
diff --git a/telepathy/server/media.py b/src/server/media.py
index 6b02149..6b02149 100644
--- a/telepathy/server/media.py
+++ b/src/server/media.py
diff --git a/telepathy/server/properties.py b/src/server/properties.py
index 6e7dff9..6e7dff9 100644
--- a/telepathy/server/properties.py
+++ b/src/server/properties.py