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