Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline

Conflicts:
	setup.py
	toolkitfix/__init__.py

1 files changed, 3 insertions, 6 deletions

diff --git a/setup.py b/setup.py
index 4f0667d..df9b92d 100755
--- a/setup.py
+++ b/setup.py
@@ -79,13 +79,10 @@ setup(name='Tutorius',
                 'sugar.tutorius',
                 'sugar.tutorius.uam',
                 'sugar.tutorius.addons',
-                'sugar.graphics',
-                'sugar.activity',
-                'sugar',
                ],
-      package_dir={'sugar': 'toolkitfix',
-                   'sugar.tutorius': 'tutorius',
-                   'sugar.tutorius.addons': 'addons',
+      package_dir={
+                'sugar.tutorius': 'tutorius',
+                'sugar.tutorius.addons': 'addons',
                   },
       cmdclass = {'test': TestCommand},
       data_files=[('share/icons/sugar/scalable/actions', glob.glob('data/icons/*.svg')),]