Merge branch 'master' into frame_integration

1 files changed, 8 insertions, 6 deletions

diff --git a/setup.py b/setup.py
index e33873c..49bae4c 100755
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ class TestCommand(Command):
                          sources)
             coverage.report(sources)
             coverage.erase()
-    
+
     def _listsources(self, arg, dirname, fnames):
         fnames = filter(lambda x:x.endswith('.py'), fnames)
         for name in fnames:
@@ -83,7 +83,7 @@ class TestCommand(Command):
 setup(name='Tutorius',
       version='0.0',
       description='Interactive tutor and Tutorial creator',
-      maintainer='Simon Poirier', 
+      maintainer='Simon Poirier',
       maintainer_email='simpoir@gmail.com',
       author='Tutorius team',
       author_email='sugar-narratives@googlegroups.com',
@@ -97,13 +97,15 @@ setup(name='Tutorius',
                 'sugar.tutorius.apilib.httplib2',
                ],
       package_dir={
-                'sugar.tutorius': 'tutorius',
-                'sugar.tutorius.addons': 'addons',
-                  },
+          'sugar.tutorius': 'tutorius',
+          'sugar.tutorius.addons': 'addons',
+      },
       cmdclass = {'test': TestCommand},
       data_files=[('share/icons/sugar/scalable/actions', glob.glob('data/icons/*.svg')),
+                  ('share/icons/sugar/scalable/device', ['data/icons/tutortool.svg']),
                   ('share/tutorius/ui', glob.glob('data/ui/*.glade')),
+                  ('share/sugar/extensions/deviceicon', glob.glob('src/extensions/*')),
                  ]
      )
 
-# vim: set et sw=4 sts=4 ts=4: 
+# vim: set et sw=4 sts=4 ts=4: