16130N/Adiff -ur tracker-0.6.90-orig/src/libtracker-common/tracker-file-utils.c tracker-0.6.90/src/libtracker-common/tracker-file-utils.c
16130N/A--- tracker-0.6.90-orig/src/libtracker-common/tracker-file-utils.c 2009-02-24 13:33:44.919238000 +0800
16130N/A+++ tracker-0.6.90/src/libtracker-common/tracker-file-utils.c 2009-02-24 13:35:28.945355000 +0800
16130N/A@@ -834,7 +834,6 @@
16130N/A user_data_dir = g_getenv ("XDG_DATA_HOME");
16130N/A
16130N/A /* Check the default XDG_DATA_HOME location */
16130N/A- g_message (" XDG_DATA_HOME is '%s'", user_data_dir);
16130N/A
16130N/A if (user_data_dir && path_has_write_access_or_was_created (user_data_dir)) {
16130N/A return TRUE;
17336N/A
16130N/Adiff -ur tracker-0.6.90-orig/src/tracker-indexer/Makefile.am tracker-0.6.90/src/tracker-indexer/Makefile.am
16130N/A--- tracker-0.6.90-orig/src/tracker-indexer/Makefile.am 2009-02-24 13:33:44.966292000 +0800
16130N/A+++ tracker-0.6.90/src/tracker-indexer/Makefile.am 2009-02-24 13:35:56.192634000 +0800
16130N/A@@ -3,7 +3,7 @@
16130N/A SUBDIRS = modules
16130N/A
16130N/A INCLUDES = \
16130N/A- -Wall \
16130N/A+ -w \
16130N/A -DSHAREDIR=\""$(datadir)"\" \
16130N/A -DLIBDIR=\""$(libdir)"\" \
16130N/A -DLOCALEDIR=\""$(localedir)"\" \
16214N/A
16214N/A--- tracker-0.6.91/src/libtracker-common/tracker-config.c.old Sun Mar 22 11:14:46 2009
16214N/A+++ tracker-0.6.91/src/libtracker-common/tracker-config.c Sun Mar 22 11:19:08 2009
16214N/A@@ -762,6 +762,9 @@
16214N/A const gchar *watch_directory_roots[2] = { NULL, NULL };
16214N/A const gchar *empty_string_list[] = { NULL };
16214N/A
16214N/A+ /* disable evolution index till we fix it */
16214N/A+ const gchar *disabled_modules_list[] = { "evolution" , NULL };
16214N/A+
16214N/A /* Get default values */
16214N/A language = tracker_language_get_default_code ();
16214N/A
16214N/A@@ -872,7 +875,7 @@
16214N/A
16214N/A if (overwrite || !g_key_file_has_key (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, NULL)) {
16214N/A g_key_file_set_string_list (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES,
16214N/A- empty_string_list, 0);
16214N/A+ disabled_modules_list, 1);
16214N/A g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES,
16214N/A " List of disabled modules (separator=;)\n"
16214N/A " The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules",
16593N/Adiff -ur tracker-0.6.95-orig/src/libtracker-common/tracker-hal.c tracker-0.6.95/src/libtracker-common/tracker-hal.c
16593N/A--- tracker-0.6.95-orig/src/libtracker-common/tracker-hal.c 2009-06-03 13:26:39.554044000 +0800
16593N/A+++ tracker-0.6.95/src/libtracker-common/tracker-hal.c 2009-06-03 13:28:11.252100000 +0800
16593N/A@@ -401,7 +401,7 @@
16593N/A if (!volume) {
16593N/A continue;
16593N/A }
16593N/A-
16593N/A+/*
16593N/A g_debug ("HAL device:'%s' found:",
16299N/A libhal_volume_get_device_file (volume));
16299N/A g_debug (" UDI : %s",
16593N/A@@ -416,6 +416,7 @@
16299N/A libhal_volume_get_fstype (volume));
16299N/A g_debug (" Label : %s",
16299N/A libhal_volume_get_label (volume));
16593N/A+*/
16299N/A
16299N/A hal_device_add (hal, volume);
16299N/A libhal_volume_free (volume);
17336N/A@@ -589,8 +589,6 @@
17336N/A return "LIBHAL_DRIVE_TYPE_JAZ";
17336N/A case LIBHAL_DRIVE_TYPE_FLASHKEY:
17336N/A return "LIBHAL_DRIVE_TYPE_FLASHKEY";
17336N/A- case LIBHAL_DRIVE_TYPE_MO:
17336N/A- return "LIBHAL_DRIVE_TYPE_MO";
17336N/A default:
17336N/A return "";
17336N/A }
16593N/A@@ -945,7 +946,7 @@
16593N/A /* Not a device with a volume */
16593N/A return;
16593N/A }
16593N/A-
16593N/A+/*
16593N/A g_message ("HAL device:'%s' added:",
16593N/A libhal_volume_get_device_file (volume));
16593N/A g_message (" UDI : %s",
16593N/A@@ -960,7 +961,7 @@
16593N/A libhal_volume_get_fstype (volume));
16593N/A g_message (" Label : %s",
16593N/A libhal_volume_get_label (volume));
16593N/A-
16593N/A+*/
16593N/A hal_device_add (hal, volume);
16593N/A libhal_volume_free (volume);
16593N/A }
17070N/A--- tracker-0.6.95/Makefile.am.old Thu Aug 20 16:24:06 2009
17070N/A+++ tracker-0.6.95/Makefile.am Thu Aug 20 16:24:52 2009
17070N/A@@ -42,16 +42,16 @@
17070N/A
17070N/A if OLD_EXEC_REMOVE_ALL
17070N/A install-exec-hook:
17070N/A- rm -Rf $(DESTDIR)$(bindir)/trackerd
17070N/A- rm -Rf $(DESTDIR)$(bindir)/tracker-indexer
17070N/A- rm -Rf $(DESTDIR)$(bindir)/tracker-thumbnailer
17070N/A- rm -Rf $(DESTDIR)$(bindir)/tracker-extract
17070N/A+# rm -Rf $(DESTDIR)$(bindir)/trackerd
17070N/A+# rm -Rf $(DESTDIR)$(bindir)/tracker-indexer
17070N/A+# rm -Rf $(DESTDIR)$(bindir)/tracker-thumbnailer
17070N/A+# rm -Rf $(DESTDIR)$(bindir)/tracker-extract
17070N/A endif
17070N/A
17070N/A if OLD_DATA_REMOVE_ALL
17070N/A install-data-hook:
17070N/A- rm -Rf $(DESTDIR)$(DBUS_SERVICES_DIR)/tracker.service
17070N/A- rm -Rf $(DESTDIR)$(datadir)/tracker/sqlite-service-stored-procs.sql
17070N/A- rm -Rf $(DESTDIR)$(datadir)/tracker/tracker-introspect.xml
17070N/A+# rm -Rf $(DESTDIR)$(DBUS_SERVICES_DIR)/tracker.service
17070N/A+# rm -Rf $(DESTDIR)$(datadir)/tracker/sqlite-service-stored-procs.sql
17070N/A+# rm -Rf $(DESTDIR)$(datadir)/tracker/tracker-introspect.xml
17070N/A endif
17070N/A