Blame gnome-activity-journal-0.3.3-install-fixes.patch

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