Merge lp:~genesis-devs/genesis-sync/0.4.2-fixes into lp:genesis-sync/trunk

[davidcaste]

[lp:~genesis-devs/genesis-sync/0.4.2-fixes]

89. By davidcaste on 2009-12-16

 * Support for distutils install with an arbitrary prefix.

=== modified file 'Genesis/genesis.py'
--- Genesis/genesis.py	2009-11-23 20:18:29 +0000
+++ Genesis/genesis.py	2009-12-16 09:36:18 +0000
@@ -20,7 +20,6 @@
 import os
 import sys
 import glob
-import thread
 import logging
 import textwrap
 
@@ -39,8 +38,15 @@
 import dbus
 import locale
 import gettext
-import configobj
-import validate
+
+try:
+    import configobj, validate
+except ImportError:
+    print 'Sorry, but the python configobj module is unavailable in your system.'
+    print 'Please, install it (ex. python-configobj package in Debian/Ubuntu) and run Genesis again.'
+    sys.exit()
+    
+from threading import Thread, Lock
 from xdg import BaseDirectory, DesktopEntry
 
 from Genesis.config import *
@@ -334,7 +340,6 @@
     def save_preference(self, widget):
         """
         Pass the preference value to the config object.
-        
         """
         widget_type, name = widget.name.split('_', 1)
         if hasattr(widget, 'get_value'):
@@ -374,6 +379,7 @@
             self.server = self.config['default_server']
         except KeyError:
             self.server = None
+        self.lock = Lock()
         self.log = None
         self.syncevolution = syncevolution.SyncEvolution()
         self.tooltip = _('Synchronize with "%s"')
@@ -625,10 +631,10 @@
         if not self.server:
             self.add_server(widget)
             return
-        self.anim_icon.set_animate(True)
-        self.status_icon.set_tooltip(self.tooltip_sync % self.server)
-        thread.start_new_thread(
-                    self.sync_thread, args, {'show': show})
+
+        # Perform the synchronization in a non-UI thread
+        Thread(target=self.sync_thread, args=args, kwargs={'show': show}).start()
+        
         return True
         
     def sync_thread(self, *args, **kwargs):
@@ -648,42 +654,59 @@
         """
         if 'show' in kwargs:
             show = kwargs['show']
+            
+        # Thread synchronization protocol init
+        # Only one synchronization thread is allowed to run at the same time
+        self.lock.acquire()
+        
         try:
-            # Assume working network connection if networkmanager is not
-            # available.
-            if nm is None:
-                network_available = True
-            # Otherwise, ask networkmanager for network state.
-            else:
-                network_available = nm.state() == NM_STATE_CONNECTED
-            # Only try syncing if network is available
-            if network_available:
-                result = self.syncevolution.sync(self.server, *args)
-                logger.debug('Sync result: %s' % result)
-            else:
-                raise syncevolution.SyncError(_('Network not available.'))
-        except syncevolution.SyncError, e:
-            self.log = e.log
+            # Start the tray-icon animation
             gtk.gdk.threads_enter()
-            self.notify(_('Synchronization Failed'), e.message, 'error')
-            logger.error('Sync failed: %s' % e.message)
+            self.anim_icon.set_animate(True)
+            self.status_icon.set_tooltip(self.tooltip_sync % self.server)
             gtk.gdk.threads_leave()
-        else:
-            # See if a sync has actually been performed
-            sync_performed = False
-            for key in result:
-                if True in [nonzero(item) for item in result[key]]:
-                    sync_performed = True
-                    break
-            if show == SHOW_ALL or (show == SHOW_NONEMPTY and sync_performed):
+            
+            try:
+                # Assume working network connection if networkmanager is not
+                # available.
+                if nm is None:
+                    network_available = True
+                # Otherwise, ask networkmanager for network state.
+                else:
+                    network_available = nm.state() == NM_STATE_CONNECTED
+                # Only try syncing if network is available
+                if network_available:
+                    result = self.syncevolution.sync(self.server, *args)
+                    logger.debug('Sync result: %s' % result)
+                else:
+                    raise syncevolution.SyncError(_('Network not available.'))
+            except syncevolution.SyncError, e:
+                self.log = e.log
                 gtk.gdk.threads_enter()
-                self.notify(_('Synchronization Results'),
-                        format_result(result))
+                self.notify(_('Synchronization Failed'), e.message, 'error')
+                logger.error('Sync failed: %s' % e.message)
                 gtk.gdk.threads_leave()
-        gtk.gdk.threads_enter()
-        self.anim_icon.set_animate(False)
-        self.status_icon.set_tooltip(self.tooltip % self.server)
-        gtk.gdk.threads_leave()
+            else:
+                # See if the sync has actually been performed
+                sync_performed = False
+                for key in result:
+                    if True in [nonzero(item) for item in result[key]]:
+                        sync_performed = True
+                        break
+                if show == SHOW_ALL or (show == SHOW_NONEMPTY and sync_performed):
+                    gtk.gdk.threads_enter()
+                    self.notify(_('Synchronization Results'),
+                            format_result(result))
+                    gtk.gdk.threads_leave()
+            
+            # Finish the tray-icon animation
+            gtk.gdk.threads_enter()
+            self.anim_icon.set_animate(False)
+            self.status_icon.set_tooltip(self.tooltip % self.server)
+            gtk.gdk.threads_leave()
+        finally:
+            # Thread synchronization protocol end
+            self.lock.release()
         
         
 def main():

=== modified file 'Genesis/ui/preferences_dialog.ui'
--- Genesis/ui/preferences_dialog.ui	2009-11-28 13:33:43 +0000
+++ Genesis/ui/preferences_dialog.ui	2009-12-16 09:36:18 +0000
@@ -92,7 +92,7 @@
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="adjustment">adjustment1</property>
-                    <signal name="changed" handler="on_preference_change"/>
+                    <signal name="value_changed" handler="on_preference_change"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>

=== modified file 'bin/genesis'
--- bin/genesis	2009-11-23 20:18:29 +0000
+++ bin/genesis	2009-12-16 09:36:18 +0000
@@ -21,9 +21,19 @@
 import sys
 from Genesis import config
 
-config.LOCALE_DIR = os.path.join(sys.prefix, 'share/locale')
-config.DESKTOP_DIR = os.path.join(sys.prefix, 'share/applications')
-config.DATA_DIR = os.path.join(sys.prefix, 'share/genesis')
+# I assume that genesis main script is always located under the relative path
+# 'bin/genesis', so the prefix would be the front part of the absolute path.
+genesis_abspath = os.path.abspath(__file__)
+prefix = genesis_abspath.split('/')[1:-2]
+if prefix is not None:
+	prefix = '/' + '/'.join(prefix)
+else:
+	# If that fails, use instead the standard 'sys.prefix'
+	prefix = sys.prefix
+
+config.LOCALE_DIR = os.path.join(prefix, 'share/locale')
+config.DESKTOP_DIR = os.path.join(prefix, 'share/applications')
+config.DATA_DIR = os.path.join(prefix, 'share/genesis')
 config.GUI_DIR = config.DATA_DIR
 config.AUTOSTART_DIR = 'autostart'
 

=== modified file 'locale/cs/LC_MESSAGES/genesis.mo'
Binary files locale/cs/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/cs/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/da/LC_MESSAGES/genesis.mo'
Binary files locale/da/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/da/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/de/LC_MESSAGES/genesis.mo'
Binary files locale/de/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/de/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/en_CA/LC_MESSAGES/genesis.mo'
Binary files locale/en_CA/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/en_CA/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/en_GB/LC_MESSAGES/genesis.mo'
Binary files locale/en_GB/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/en_GB/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/es/LC_MESSAGES/genesis.mo'
Binary files locale/es/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/es/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/fr/LC_MESSAGES/genesis.mo'
Binary files locale/fr/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/fr/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/gl/LC_MESSAGES/genesis.mo'
Binary files locale/gl/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/gl/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/he/LC_MESSAGES/genesis.mo'
Binary files locale/he/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/he/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/hu/LC_MESSAGES/genesis.mo'
Binary files locale/hu/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/hu/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/it/LC_MESSAGES/genesis.mo'
Binary files locale/it/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/it/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/lt/LC_MESSAGES/genesis.mo'
Binary files locale/lt/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/lt/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/ms/LC_MESSAGES/genesis.mo'
Binary files locale/ms/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/ms/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/nb/LC_MESSAGES/genesis.mo'
Binary files locale/nb/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/nb/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/nl/LC_MESSAGES/genesis.mo'
Binary files locale/nl/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/nl/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/pl/LC_MESSAGES/genesis.mo'
Binary files locale/pl/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/pl/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/pt_BR/LC_MESSAGES/genesis.mo'
Binary files locale/pt_BR/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/pt_BR/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== modified file 'locale/ru/LC_MESSAGES/genesis.mo'
Binary files locale/ru/LC_MESSAGES/genesis.mo	2009-11-23 22:07:35 +0000 and locale/ru/LC_MESSAGES/genesis.mo	2009-12-16 09:36:18 +0000 differ
=== added directory 'locale/templates'
=== added file 'locale/templates/genesis.pot'
--- locale/templates/genesis.pot	1970-01-01 00:00:00 +0000
+++ locale/templates/genesis.pot	2009-12-16 09:36:18 +0000
@@ -0,0 +1,250 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-21 17:46+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-06 11:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../Genesis/genesis.py:108
+msgid "new on client"
+msgstr ""
+
+#: ../Genesis/genesis.py:109
+msgid "modified on client"
+msgstr ""
+
+#: ../Genesis/genesis.py:110
+msgid "deleted on client"
+msgstr ""
+
+#: ../Genesis/genesis.py:111
+msgid "new on server"
+msgstr ""
+
+#: ../Genesis/genesis.py:112
+msgid "modified on server"
+msgstr ""
+
+#: ../Genesis/genesis.py:113
+msgid "deleted on server"
+msgstr ""
+
+#: ../Genesis/genesis.py:127
+msgid "No changes necessary."
+msgstr ""
+
+#: ../Genesis/genesis.py:380
+#, python-format
+msgid "Synchronize with \"%s\""
+msgstr ""
+
+#: ../Genesis/genesis.py:381 ../Genesis/genesis.py:491
+msgid "Configure SyncEvolution"
+msgstr ""
+
+#: ../Genesis/genesis.py:382
+#, python-format
+msgid "Synchronizing with \"%s\""
+msgstr ""
+
+#. Sync
+#: ../Genesis/genesis.py:407
+msgid "Synchronize"
+msgstr ""
+
+#: ../Genesis/genesis.py:408
+msgid "Start synchronization with server"
+msgstr ""
+
+#: ../Genesis/genesis.py:422
+msgid "Special Synchronization"
+msgstr ""
+
+#: ../Genesis/genesis.py:427
+msgid "Select Server"
+msgstr ""
+
+#. Add server
+#: ../Genesis/genesis.py:431
+msgid "Add Server..."
+msgstr ""
+
+#: ../Genesis/genesis.py:432
+msgid "Add a server to the configuration"
+msgstr ""
+
+#: ../Genesis/genesis.py:492
+msgid ""
+"SyncEvolution is not yet configured.\n"
+"To set up synchronization, please click the icon."
+msgstr ""
+
+#: ../Genesis/genesis.py:575
+msgid "Show Log"
+msgstr ""
+
+#: ../Genesis/genesis.py:664
+msgid "Network not available."
+msgstr ""
+
+#: ../Genesis/genesis.py:668
+msgid "Synchronization Failed"
+msgstr ""
+
+#: ../Genesis/genesis.py:680
+msgid "Synchronization Results"
+msgstr ""
+
+#: ../Genesis/syncevolution.py:192
+msgid "An error occured during the synchronisation process."
+msgstr ""
+
+#: ../Genesis/settings.py:102
+msgid "Custom Server"
+msgstr ""
+
+#: ../Genesis/settings.py:147
+msgid ""
+"The source URI for this source.\n"
+" It  is appended to the server's URL to identify the server's database.\n"
+" If no source URI is given, the default will be used."
+msgstr ""
+
+#. sc = ServerConfig('scheduleworld')
+#. sys.exit()
+#: ../Genesis/genesis.glade.h:1 ../Genesis/genesis.glade.h:1
+msgid "About Genesis Sync"
+msgstr ""
+
+#: ../Genesis/genesis.glade.h:2 ../Genesis/genesis.glade.h:2
+msgid "Error Log"
+msgstr ""
+
+#: ../Genesis/genesis.glade.h:3 ../Genesis/settings.glade.h:29
+#: ../Genesis/genesis.glade.h:3 ../Genesis/settings.glade.h:29
+msgid "gtk-close"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:1 ../Genesis/settings.glade.h:1
+msgid "Account settings"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:2 ../Genesis/settings.glade.h:2
+msgid "Add server"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:3 ../Genesis/settings.glade.h:3
+msgid "Addressbook"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:4 ../Genesis/settings.glade.h:4
+msgid "Calendar"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:5 ../Genesis/settings.glade.h:5
+msgid "Choose sources"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:6 ../Genesis/settings.glade.h:6
+msgid "Genesis Preferences"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:7 ../Genesis/settings.glade.h:7
+msgid "Launch Genesis on startup"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:8 ../Genesis/settings.glade.h:8
+msgid "Notes"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:9 ../Genesis/settings.glade.h:9
+msgid "Password:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:10 ../Genesis/settings.glade.h:10
+msgid "Please add your account information:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:11 ../Genesis/settings.glade.h:11
+msgid "Please select the sources you want to synchronize."
+msgstr ""
+
+#: ../Genesis/settings.glade.h:12 ../Genesis/settings.glade.h:12
+msgid "Proxy server:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:13 ../Genesis/settings.glade.h:13
+msgid "Proxy settings"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:14 ../Genesis/settings.glade.h:14
+msgid "Server address:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:15 ../Genesis/settings.glade.h:15
+msgid "Server name:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:16 ../Genesis/settings.glade.h:16
+msgid "Server template:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:17 ../Genesis/settings.glade.h:17
+msgid "Start Genesis when the user logs in"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:18 ../Genesis/settings.glade.h:18
+msgid "Synchronize automatically"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:19 ../Genesis/settings.glade.h:19
+msgid "Synchronize on startup"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:20 ../Genesis/settings.glade.h:20
+msgid "Synchronize with the current server in a given interval"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:21 ../Genesis/settings.glade.h:21
+msgid "Synchronize with the current server when Genesis is launched"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:22 ../Genesis/settings.glade.h:22
+msgid ""
+"This assistant will set up a server configuration for SyncEvolution.\n"
+"\n"
+"Please choose a unique name for this connection and the kind of account you "
+"want to synchronize with."
+msgstr ""
+
+#: ../Genesis/settings.glade.h:25 ../Genesis/settings.glade.h:25
+msgid "Todo"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:26 ../Genesis/settings.glade.h:26
+msgid "Use proxy server"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:27 ../Genesis/settings.glade.h:27
+msgid "Username:"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:28 ../Genesis/settings.glade.h:28
+msgid "every"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:30 ../Genesis/settings.glade.h:30
+msgid "http://<host>:<port>"
+msgstr ""
+
+#: ../Genesis/settings.glade.h:31 ../Genesis/settings.glade.h:31
+msgid "minutes"
+msgstr ""

=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2009-11-23 20:18:29 +0000
+++ setup.py	2009-12-16 09:36:18 +0000
@@ -1,54 +1,73 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
 import glob
+import sys
 import os
+import subprocess
+from distutils.core import setup
 
 from Genesis import __version__ as VERSION
 
 #Create an array with all the locale filenames
 I18NFILES = []
 for filepath in glob.glob("locale/*/LC_MESSAGES/*.mo"):
-	targetpath = os.path.dirname(os.path.join("share/", filepath))
-	I18NFILES.append((targetpath, [filepath]))
+    targetpath = os.path.dirname(os.path.join("share/", filepath))
+    I18NFILES.append((targetpath, [filepath]))
+
+ICONTHEMEDIRS = ('/usr/share/icons/hicolor',
+                 '/usr/share/icons/Humanity',
+                 '/usr/share/icons/Humanity-Dark')
 
 dist = setup(name='genesis',
-	version=VERSION,
-	author='Frederik Elwert',
-	author_email='[e-mail]',
-	maintainer='Frederik Elwert',
-	maintainer_email='[e-mail]',
-	description='Graphical frontend to SyncEvolution.',
-	long_description='Genesis is a graphical frontend for SyncEvolution written in PyGTK. It makes SyncEvolution accessible without having to use a command line and provides graphical feedback of transaction results.',
-	url='https://launchpad.net/genesis-sync',
-	download_url='https://launchpad.net/genesis-sync/+download',
-	license='GNU GPL',
-	platforms='linux',
-	scripts=['bin/genesis'],
-	packages=['Genesis'],
-	data_files=[
-		('share/genesis/', glob.glob("Genesis/ui/*.ui")
-		                 + ['Genesis/genesis.spec.ini']),
-		('share/icons/hicolor/22x22/apps', ['icons/hicolor/22/genesis.png']),
-		('share/icons/hicolor/22x22/status',
-		        glob.glob('icons/hicolor/22/genesis-*.png')),
-		('share/icons/hicolor/24x24/apps', ['icons/hicolor/24/genesis.png']),
-		('share/icons/hicolor/24x24/status',
-		        glob.glob('icons/hicolor/24/genesis-*.png')),
-		('share/icons/hicolor/scalable/apps', ['icons/hicolor/48/genesis.svg']),
-		('share/icons/hicolor/scalable/status',
-		        ['icons/hicolor/48/notification-sync-done.svg']),
-		('share/icons/Humanity/status/22',
-		        glob.glob('icons/Humanity/22/genesis-*.svg')),
-		('share/icons/Humanity/status/24',
-		        glob.glob('icons/Humanity/24/genesis-*.svg')),
-		('share/icons/Humanity/status/48',
-		        glob.glob('icons/Humanity/48/notification-sync*.svg')),
-		('share/icons/Humanity-Dark/status/22',
-		        glob.glob('icons/Humanity-Dark/22/genesis-*.svg')),
-		('share/icons/Humanity-Dark/status/24',
-		        glob.glob('icons/Humanity-Dark/24/genesis-*.svg')),
-		('share/applications', ['bin/genesis.desktop']),
-		] + I18NFILES
+    version=VERSION,
+    author='Frederik Elwert',
+    author_email='[e-mail]',
+    maintainer='Frederik Elwert',
+    maintainer_email='[e-mail]',
+    description='Graphical frontend to SyncEvolution.',
+    long_description='Genesis is a graphical frontend for SyncEvolution written in PyGTK. It makes SyncEvolution accessible without having to use a command line and provides graphical feedback of transaction results.',
+    url='https://launchpad.net/genesis-sync',
+    download_url='https://launchpad.net/genesis-sync/+download',
+    license='GNU GPL',
+    platforms='linux',
+    scripts=['bin/genesis'],
+    packages=['Genesis'],
+    data_files=[
+        ('share/genesis/',
+            glob.glob("Genesis/ui/*.ui") + ['Genesis/genesis.spec.ini']),
+        ('/usr/share/icons/hicolor/22x22/apps',
+            ['icons/hicolor/22/genesis.png']),
+        ('/usr/share/icons/hicolor/22x22/status',
+            glob.glob('icons/hicolor/22/genesis-*.png')),
+        ('/usr/share/icons/hicolor/24x24/apps',
+            ['icons/hicolor/24/genesis.png']),
+        ('/usr/share/icons/hicolor/24x24/status',
+            glob.glob('icons/hicolor/24/genesis-*.png')),
+        ('/usr/share/icons/hicolor/scalable/apps',
+            ['icons/hicolor/48/genesis.svg']),
+        ('/usr/share/icons/hicolor/scalable/status',
+            ['icons/hicolor/48/notification-sync-done.svg']),
+        ('/usr/share/icons/Humanity/status/22',
+            glob.glob('icons/Humanity/22/genesis-*.svg')),
+        ('/usr/share/icons/Humanity/status/24',
+            glob.glob('icons/Humanity/24/genesis-*.svg')),
+        ('/usr/share/icons/Humanity/status/48',
+            glob.glob('icons/Humanity/48/notification-sync*.svg')),
+        ('/usr/share/icons/Humanity-Dark/status/22',
+            glob.glob('icons/Humanity-Dark/22/genesis-*.svg')),
+        ('/usr/share/icons/Humanity-Dark/status/24',
+            glob.glob('icons/Humanity-Dark/24/genesis-*.svg')),
+        ('share/applications', ['bin/genesis.desktop']),
+        ] + I18NFILES
 )
 
+#
+# Post installation
+#
+if sys.argv[1] == 'install':
+    print 'Running gtk-update-icon-cache'
+
+    for ICONTHEMEDIR in ICONTHEMEDIRS:
+        subprocess.Popen(
+            ['gtk-update-icon-cache', '-f', '-t', ICONTHEMEDIR], 
+            stdout=subprocess.PIPE).communicate()[0]