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

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Nov  6 13:15:08 2011
New Revision: 31220

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31220
Log:
* New upstream release
* debian/patches/13_tracker.patch: Updated

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

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=31220&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Sun Nov  6 13:15:08 2011
@@ -1,3 +1,10 @@
+nautilus (3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/13_tracker.patch: Updated
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 06 Nov 2011 13:14:45 +0000
+
 nautilus (3.0.2-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: 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=31220&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/13_tracker.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/13_tracker.patch [utf-8] Sun Nov  6 13:15:08 2011
@@ -1,47 +1,16 @@
 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:48:41.130933050 +0200
-@@ -32,9 +32,10 @@
+diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c
+index 2704f6a..f202a64 100644
+--- a/libnautilus-private/nautilus-search-engine-tracker.c
++++ b/libnautilus-private/nautilus-search-engine-tracker.c
+@@ -34,7 +34,7 @@
   * 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;
-@@ -309,7 +311,7 @@
- 	g_string_append (sparql, "  fts:match ");
- 	sparql_append_string_literal (sparql, search_text);
- 
--	if (location || mime_count > 0) {
-+	if (location_uri || mime_count > 0) {
- 		g_string_append (sparql, " . FILTER (");
- 	
- 		if (location_uri)  {
+ struct NautilusSearchEngineTrackerDetails {
+ 	TrackerSparqlConnection *connection;