r30177 - in /desktop/experimental/nautilus/debian: changelog patches/13_tracker.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 11 15:29:25 2011
New Revision: 30177

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30177
Log:
* debian/nautilus.install:
* debian/patches/13_tracker.patch:
  - Add support for tracker 0.12. Closes: #643946
  - Enable full text search.

Added:
    desktop/experimental/nautilus/debian/patches/13_tracker.patch
Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/patches/series

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=30177&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Tue Oct 11 15:29:25 2011
@@ -18,8 +18,11 @@
   * debian/watch:
     - Update to version 3.
     - Track .xz tarballs.
-  * debian/nautilus.install
+  * debian/nautilus.install:
     - Install dbus service file for nautilus.
+  * debian/patches/13_tracker.patch:
+    - Add support for tracker 0.12. Closes: #643946
+    - Enable full text search.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 11 Oct 2011 16:25:36 +0200
 

Added: desktop/experimental/nautilus/debian/patches/13_tracker.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/13_tracker.patch?rev=30177&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/13_tracker.patch (added)
+++ desktop/experimental/nautilus/debian/patches/13_tracker.patch [utf-8] Tue Oct 11 15:29:25 2011
@@ -1,0 +1,38 @@
+Description: Add support for tracker 0.12 and enable full text search
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643946
+Index: nautilus-3.0.2/libnautilus-private/nautilus-search-engine-tracker.c
+===================================================================
+--- nautilus-3.0.2.orig/libnautilus-private/nautilus-search-engine-tracker.c	2011-04-04 20:01:22.000000000 +0200
++++ nautilus-3.0.2/libnautilus-private/nautilus-search-engine-tracker.c	2011-10-11 17:26:04.035994045 +0200
+@@ -32,9 +32,10 @@
+  * use filename matching instead. This doesn't use the content of the
+  * file however.
+  */
+-#undef FTS_MATCHING
++#define FTS_MATCHING
+ 
+-#define MODULE_FILENAME "libtracker-sparql-0.10.so.0"
++#define MODULE_FILENAME_0_12 "libtracker-sparql-0.12.so.0"
++#define MODULE_FILENAME_0_10 "libtracker-sparql-0.10.so.0"
+ 
+ #define MODULE_MAP(a)   { #a, (gpointer *)&a }
+ 
+@@ -105,11 +106,12 @@
+ 
+ 	flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
+ 
+-	/* Only support 0.10 onwards */
+-	if ((m = g_module_open (MODULE_FILENAME, flags)) == NULL)  {
+-		g_debug ("No tracker backend available or it is not new enough");
+-		g_debug ("Only available using '%s'", MODULE_FILENAME);
+-		return FALSE;
++	/* First try 0.12, then 0.10 */
++	if ((m = g_module_open (MODULE_FILENAME_0_12, flags)) == NULL) {
++		if ((m = g_module_open (MODULE_FILENAME_0_10, flags)) == NULL) {
++			g_debug ("No tracker backend available or it is not new enough");
++			return FALSE;
++		}
+ 	}
+ 
+ 	inited = TRUE;

Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=30177&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/series [utf-8] Tue Oct 11 15:29:25 2011
@@ -1,2 +1,3 @@
 03_deprecated.patch
 12_list-view_expand.patch
+13_tracker.patch