Fix setup.py to install packages in the correct place

diff --git a/setup.py b/setup.py
index e1d25c5..673450c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python3
 
 from os import path
-from debian_bundle.changelog import Changelog
-from debian_bundle.deb822 import Deb822
+from debian.changelog import Changelog
+from debian.deb822 import Deb822
 from email.utils import parseaddr
 from glob import glob
 from setuptools import setup, find_packages
 
 version = Changelog(open(path.join(path.dirname(__file__), 'debian/changelog')).read()).\
-    get_version().full_version
+    full_version
 
 maintainer_full = Deb822(open(path.join(path.dirname(__file__), 'debian/control')))['Maintainer']
 maintainer, maintainer_email = parseaddr(maintainer_full)
@@ -19,7 +19,7 @@ setup(
     maintainer=maintainer,
     maintainer_email=maintainer_email,
     
-    packages=find_packages('python'),
-    package_dir={'': 'python'},
+    packages=['invirt.' + x for x in find_packages('python')],
+    package_dir={'invirt': 'python'},
     scripts=glob('scripts/*')
 )