r23634 - in /desktop/unstable/nautilus/debian: changelog patches/04_tracker_0.8.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Apr  9 08:16:18 2010
New Revision: 23634

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23634
Log:
Add support for tracker 0.8 (even if we don't enable it just yet)

Added:
    desktop/unstable/nautilus/debian/patches/04_tracker_0.8.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=23634&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Fri Apr  9 08:16:18 2010
@@ -1,3 +1,10 @@
+nautilus (2.28.4-3) UNRELEASED; urgency=low
+
+  * debian/patches/04_tracker_0.8.patch
+    - Add support for tracker 0.8.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 09 Apr 2010 10:09:10 +0200
+
 nautilus (2.28.4-2) unstable; urgency=low
 
   * 03_deprecated.patch: new patch. Don’t use -D*DISABLE_DEPRECATED for 

Added: desktop/unstable/nautilus/debian/patches/04_tracker_0.8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/04_tracker_0.8.patch?rev=23634&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/04_tracker_0.8.patch (added)
+++ desktop/unstable/nautilus/debian/patches/04_tracker_0.8.patch [utf-8] Fri Apr  9 08:16:18 2010
@@ -1,0 +1,68 @@
+Index: nautilus-2.28.4/configure.in
+===================================================================
+--- nautilus-2.28.4.orig/configure.in	2010-04-09 02:22:14.237099766 +0200
++++ nautilus-2.28.4/configure.in	2010-04-09 02:22:15.281100899 +0200
+@@ -207,10 +207,10 @@
+ 			[build without tracker support]))
+ msg_tracker=no
+ if test "x$enable_tracker" != "xno"; then
+-	PKG_CHECK_MODULES(TRACKER, tracker-client-0.7, [
++	PKG_CHECK_MODULES(TRACKER, tracker-client-0.8, [
+ 	                  AM_CONDITIONAL(HAVE_TRACKER, true)
+ 			  AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support])
+-			  AC_DEFINE(HAVE_TRACKER_0_7, 1, [Define to enable tracker support])
++			  AC_DEFINE(HAVE_TRACKER_0_8, 1, [Define to enable tracker support])
+ 			  ]
+                           msg_tracker=yes,
+ 	                  [
+Index: nautilus-2.28.4/libnautilus-private/nautilus-search-engine-tracker.c
+===================================================================
+--- nautilus-2.28.4.orig/libnautilus-private/nautilus-search-engine-tracker.c	2009-12-09 12:03:51.000000000 +0100
++++ nautilus-2.28.4/libnautilus-private/nautilus-search-engine-tracker.c	2010-04-09 02:22:32.925098561 +0200
+@@ -26,8 +26,8 @@
+ #include <eel/eel-gtk-macros.h>
+ #include <eel/eel-glib-extensions.h>
+ 
+-#ifdef HAVE_TRACKER_0_7
+-#include <libtracker-client/tracker.h>
++#ifdef HAVE_TRACKER_0_8
++#include <libtracker-client/tracker-client.h>
+ #else
+ #include <tracker.h>
+ #endif
+@@ -96,7 +96,7 @@
+ 		
+ 		char *uri;
+ 
+-#ifdef HAVE_TRACKER_0_7
++#ifdef HAVE_TRACKER_0_8
+ 		uri = g_strdup ((char *)*results_p);
+ #else
+ 		uri = g_filename_to_uri ((char *)*results_p, NULL, NULL);
+@@ -139,7 +139,7 @@
+ 	location_uri = nautilus_query_get_location (tracker->details->query);
+ 
+ 	if (location_uri) {
+-#ifdef HAVE_TRACKER_0_7
++#ifdef HAVE_TRACKER_0_8
+ 		location = g_strdup (location_uri);
+ #else
+ 		location = g_filename_from_uri (location_uri, NULL, NULL);
+@@ -271,7 +271,7 @@
+ 	NautilusSearchEngineTracker *engine;
+ 	TrackerClient *tracker_client;
+ 
+-#ifdef HAVE_TRACKER_0_7
++#ifdef HAVE_TRACKER_0_8
+ 	tracker_client = tracker_connect (FALSE, -1);
+ #else
+ 	tracker_client = tracker_connect (FALSE);
+@@ -281,7 +281,7 @@
+ 		return NULL;
+ 	}
+ 
+-#ifndef HAVE_TRACKER_0_7
++#ifndef HAVE_TRACKER_0_8
+ 	GError *err = NULL;
+ 
+ 	tracker_get_version (tracker_client, &err);

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=23634&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Fri Apr  9 08:16:18 2010
@@ -2,6 +2,7 @@
 01_manpage.patch
 02_eel_libadd.patch
 03_deprecated.patch
+04_tracker_0.8.patch
 10_load_session.patch
 12_list-view_expand.patch
 20_open-with_install.patch