Performing merge
[zukebox] / zukebox_server / setup.py
index 1d0f757..45de651 100644 (file)
@@ -22,16 +22,25 @@ def main():
                        'zukebox_server/plugins/audio_library':
                        'src/plugins/audio_library',
                        'zukebox_server/system': 'src/system',
-                       'zukebox_server/server': 'src/server'
+                       'zukebox_server/server': 'src/server',
+                       'zukebox_server/services': 'src/services',
+                       'zukebox_server/services/playlist':
+                       'src/services/playlist',
+                       'zukebox_server/xml_descriptions':
+                       'src/xml_descriptions'
                        },
         packages=['zukebox_server',
-                  'zukebox_server/plugins',
+                  'zukebox_server/services',
+                  'zukebox_server/services/playlist',
+                  'zukebox_sever/plugins',
                   'zukebox_server/plugins/audio_library',
                   'zukebox_server/system',
-                  'zukebox_server/server'
+                  'zukebox_server/server',
+                  'zukebox_server/xml_descriptions'
                  ],
+        package_data={'zukebox_server/xml_descriptions': ['*.xml']},
         data_files=[('share/dbus-1/services',
-                    ['src/br.org.zagaia.ZukeBox.service']),
+                    ['src/br.org.zagaia.zukebox.ZukeBoxServer.service']),
                    ])
 
 if __name__ == "__main__":