3abb5f5
diff -N -r -u gnome-activity-journal-0.3.3/extra/gnome-activity-journal.desktop.in gnome-activity-journal-0.3.3.install-fixes/extra/gnome-activity-journal.desktop.in
3abb5f5
--- gnome-activity-journal-0.3.3/extra/gnome-activity-journal.desktop.in	2010-02-09 01:40:55.000000000 +0100
3abb5f5
+++ gnome-activity-journal-0.3.3.install-fixes/extra/gnome-activity-journal.desktop.in	2010-02-26 07:06:55.459328363 +0100
3abb5f5
@@ -3,6 +3,6 @@
3abb5f5
 _Name=Activity Journal
3abb5f5
 _GenericName=Activity Journal
3abb5f5
 _Comment=Browse a chronological log of your activities and easily find files, contacts, etc.
3abb5f5
-Exec=gnome-activity-journal
3abb5f5
+Exec=gnome-activity-journal.sh
3abb5f5
 Icon=gnome-activity-journal
3abb5f5
 Categories=GTK;Utility;
3abb5f5
diff -N -r -u gnome-activity-journal-0.3.3/gnome-activity-journal.sh gnome-activity-journal-0.3.3.install-fixes/gnome-activity-journal.sh
3abb5f5
--- gnome-activity-journal-0.3.3/gnome-activity-journal.sh	1970-01-01 01:00:00.000000000 +0100
3abb5f5
+++ gnome-activity-journal-0.3.3.install-fixes/gnome-activity-journal.sh	2010-02-26 07:06:17.537077995 +0100
3abb5f5
@@ -0,0 +1,6 @@
3abb5f5
+#!/bin/bash
3abb5f5
+
3abb5f5
+PREFIX=/usr
3abb5f5
+GAJDIR=share/gnome-activity-journal
3abb5f5
+
3abb5f5
+exec $PREFIX/$GAJDIR/gnome-activity-journal
3abb5f5
\ No newline at end of file
3abb5f5
diff -N -r -u gnome-activity-journal-0.3.3/setup.cfg gnome-activity-journal-0.3.3.install-fixes/setup.cfg
3abb5f5
--- gnome-activity-journal-0.3.3/setup.cfg	2010-02-09 01:40:55.000000000 +0100
3abb5f5
+++ gnome-activity-journal-0.3.3.install-fixes/setup.cfg	2010-02-25 23:16:26.118563303 +0100
3abb5f5
@@ -2,4 +2,4 @@
3abb5f5
 domain=gnome-activity-journal
3abb5f5
 bug_contact=zeitgeist@lists.launchpad.net
3abb5f5
 desktop_files=[('share/applications', ('extra/gnome-activity-journal.desktop.in',))]
3abb5f5
-schemas_files=[('share/gconf/schemas', ('extra/gnome-activity-journal.schemas.in',))]
3abb5f5
+schemas_files=[('etc/gconf/schemas', ('extra/gnome-activity-journal.schemas.in',))]
3abb5f5
diff -N -r -u gnome-activity-journal-0.3.3/setup.py gnome-activity-journal-0.3.3.install-fixes/setup.py
3abb5f5
--- gnome-activity-journal-0.3.3/setup.py	2010-02-21 01:41:25.000000000 +0100
3abb5f5
+++ gnome-activity-journal-0.3.3.install-fixes/setup.py	2010-02-26 07:07:13.550077150 +0100
3abb5f5
@@ -46,22 +46,6 @@
3abb5f5
         else:
3abb5f5
             self._destdir = self.prefix
3abb5f5
         orig_install.run(self)
3abb5f5
-        # Ensure the needed directories exist
3abb5f5
-        self._create_directory('bin')
3abb5f5
-        self._create_directory('share/pixmaps')
3abb5f5
-        # Create a symlink for the executable file
3abb5f5
-        self._create_symlink(
3abb5f5
-            'share/gnome-activity-journal/gnome-activity-journal',
3abb5f5
-            'bin/gnome-activity-journal')
3abb5f5
-        # Symlink the 48x48 PNG icon into share/pixmaps
3abb5f5
-        self._create_symlink(
3abb5f5
-            'share/gnome-activity-journal/data/icons/hicolor/48x48/apps/' \
3abb5f5
-                'gnome-activity-journal.png',
3abb5f5
-            'share/pixmaps/gnome-activity-journal.png')
3abb5f5
-        # Symlink the icons so that the Journal can find them
3abb5f5
-        self._create_symlink(
3abb5f5
-            'share/icons/',
3abb5f5
-            'share/gnome-activity-journal/data/icons')
3abb5f5
 
3abb5f5
 class _build_i18n(build_i18n.build_i18n):
3abb5f5
 
3abb5f5
@@ -116,9 +100,20 @@
3abb5f5
     license = 'GPLv3+',
3abb5f5
     platforms = ['GNU/Linux'],
3abb5f5
     data_files = list_from_lists(
3abb5f5
-        [('share/gnome-activity-journal', ['gnome-activity-journal'])],
3abb5f5
+        [('bin/', ['gnome-activity-journal.sh'])],
3abb5f5
+        [('share/gnome-activity-journal/', ['gnome-activity-journal'])],
3abb5f5
         [('share/gnome-activity-journal/data', glob('data/*.svg'))],
3abb5f5
+        [('share/gnome-activity-journal/data/zlogo', glob('data/zlogo/*.png'))],
3abb5f5
+
3abb5f5
         [('share/pixmaps/', ['data/gnome-activity-journal.xpm'])],
3abb5f5
+        [('share/pixmaps/', ['data/icons/hicolor/48x48/apps/gnome-activity-journal.png'])],
3abb5f5
+
3abb5f5
+        [('share/applications/', ['build/share/applications/gnome-activity-journal.desktop'])],
3abb5f5
+        recursive_install('share/locale', 'build/mo/', '',
3abb5f5
+            ext=['.mo']),
3abb5f5
+        # gconf schemas can apparently not be easily installed using distutils
3abb5f5
+        #[('etc/gconf/schemas/', ['build/etc/gconf/schemas/gnome-activity-journal.schemas'])],
3abb5f5
+
3abb5f5
         recursive_install('share/icons/hicolor', 'data/icons/hicolor/', '',
3abb5f5
             ext=['.png', '.svg']),
3abb5f5
         recursive_install('share/gnome-activity-journal', 'src/', ext=['.py']),