Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

11 files changed, 278 insertions, 133 deletions

diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 1a86865beb54..74af4cfd03b4 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/tracker-client/Makefile,v 1.6 2009/02/27 00:23:22 marcus Exp $
+#   $MCom: ports/sysutils/tracker-client/Makefile,v 1.10 2009/10/11 11:11:33 kwm Exp $
 #
 
 PORTNAME=	tracker
-PORTVERSION=	0.6.6
-PORTREVISION=	11
+PORTVERSION=	0.6.95
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
+MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	-client
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +23,12 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
 		gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
 		qdbm.14:${PORTSDIR}/databases/qdbm \
-		exempi.3:${PORTSDIR}/textproc/exempi
+		exempi.3:${PORTSDIR}/textproc/exempi \
+		hal.1:${PORTSDIR}/sysutils/hal \
+		totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \
+		raptor.2:${PORTSDIR}/textproc/raptor \
+		ogg.6:${PORTSDIR}/audio/libogg \
+		iptcdata.3:${PORTSDIR}/graphics/libiptcdata
 RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
 		o3totxt:${PORTSDIR}/converters/o3read \
 		pdftotext:${PORTSDIR}/graphics/poppler-utils \
@@ -33,7 +38,7 @@ USE_BZIP2=	yes
 USE_FAM=	yes
 WANT_FAM_SYSTEM=gamin
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomehack gnomeprefix ltasneededhack intltool
+USE_GNOME=	gnomehack gnomeprefix ltasneededhack intltool ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
@@ -41,11 +46,12 @@ USE_GSTREAMER=	core
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--enable-file-monitoring=fam \
 		--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
-		--enable-external-qdbm
+		--enable-external-qdbm --enable-libexif --enable-libvorbis \
+		--enable-libiptcdata
 
 .include <bsd.port.pre.mk>
 
@@ -59,7 +65,7 @@ INSTALL_WRKSRC=	${WRKSRC}/src/tracker-applet
 EXTRA_WRKSRC=	src/tracker-preferences src/tracker-search-tool
 RUN_DEPENDS+=	${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
 USE_GNOME+=	gnomedesktop libgsf
-MAN1+=		tracker-applet.1  tracker-search-tool.1 tracker-preferences.1
+MAN1+=		tracker-applet.1 tracker-search-tool.1 tracker-preferences.1
 CONFIGURE_ARGS+=--enable-deskbar-applet \
 		--with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers
 . endif
@@ -71,14 +77,17 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 . endif
 .else
 MAN1+=	tracker-extract.1 tracker-files.1 \
+	tracker-info.1 \
 	tracker-meta-folder.1 tracker-query.1 \
-	tracker-search.1 tracker-stats.1 \
-	tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 trackerd.1
+	tracker-search.1 tracker-services.1 tracker-stats.1 \
+	tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 tracker-unique.1 trackerd.1
+
 MAN5+=	tracker.cfg.5
-MAN7+=	tracker-services.7
 CONFIGURE_ARGS+=	--disable-libtrackergtk --disable-gui \
 			--disable-trackerapplet --disable-gsf \
-			--disable-preferences
+			--disable-preferences   --disable-deskbar-applet \
+			--disable-tracker-applet --disable-tracker-preferences \
+			--disable-libgsf
 .endif
 
 post-patch:
@@ -104,7 +113,7 @@ post-install:
 	@(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 . endfor
 . for man in ${MAN1}
-	@(cd ${WRKSRC} && ${INSTALL_DATA} docs/${man} ${PREFIX}/man/man1/${man})
+	@(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${PREFIX}/man/man1/${man})
 . endfor
 .endif
 
diff --git a/sysutils/tracker-client/distinfo b/sysutils/tracker-client/distinfo
index 435cb9e83cb9..2848e25a3864 100644
--- a/sysutils/tracker-client/distinfo
+++ b/sysutils/tracker-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (tracker-0.6.6.tar.bz2) = 0845998f8f0d715b3f1b306d59fdae4d
-SHA256 (tracker-0.6.6.tar.bz2) = ffa374989db365f388edf0a52f901ae3becfa7a25a7e1b2dd76832eff9606a97
-SIZE (tracker-0.6.6.tar.bz2) = 901549
+MD5 (tracker-0.6.95.tar.bz2) = a4edc8aa830070bd3f1d80a7df07c80c
+SHA256 (tracker-0.6.95.tar.bz2) = 0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339
+SIZE (tracker-0.6.95.tar.bz2) = 1399996
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c
new file mode 100644
index 000000000000..d2467b17cd3f
--- /dev/null
+++ b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c
@@ -0,0 +1,12 @@
+--- src/libtracker-common/tracker-albumart.c.orig	2009-08-08 17:37:48.000000000 +0000
++++ src/libtracker-common/tracker-albumart.c	2009-08-08 17:38:14.000000000 +0000
+@@ -81,7 +81,8 @@
+ 	return retval;
+ }
+ 
+-#ifndef HAVE_STRCASESTR
++#if 0
++// #ifndef HAVE_STRCASESTR
+ 
+ static gchar *
+ strcasestr (const gchar *haystack, 
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c
new file mode 100644
index 000000000000..c6f07b336e52
--- /dev/null
+++ b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c
@@ -0,0 +1,13 @@
+--- src/libtracker-common/tracker-type-utils.c.orig	2009-08-08 17:29:36.000000000 +0000
++++ src/libtracker-common/tracker-type-utils.c	2009-08-08 17:30:09.000000000 +0000
+@@ -531,8 +531,8 @@
+ 	/* mktime() always assumes that "tm" is in locale time but we
+ 	 * want to keep control on time, so we go to UTC
+ 	 */
+-	t  = mktime (&tm);
+-	t -= timezone;
++
++	t = timegm (&tm);
+ 
+ 	if (*date_string == '+' ||
+ 	    *date_string == '-') {
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
index df2beaaac844..a5d3b6c1788b 100644
--- a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
@@ -1,19 +1,19 @@
---- src/libtracker-gtk/Makefile.in.orig	2008-03-30 15:48:54.539689924 -0400
-+++ src/libtracker-gtk/Makefile.in	2008-03-30 15:50:09.289800343 -0400
-@@ -56,7 +56,6 @@
+--- src/libtracker-gtk/Makefile.in.orig	2009-08-08 17:07:00.000000000 +0000
++++ src/libtracker-gtk/Makefile.in	2009-08-08 17:09:07.000000000 +0000
+@@ -66,7 +66,6 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libtracker_gtk_la_DEPENDENCIES =  \
 -	$(top_builddir)/src/libtracker/libtrackerclient.la \
- 	$(am__DEPENDENCIES_1)
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am_libtracker_gtk_la_OBJECTS = tracker-utils.lo tracker-ui.lo \
  	tracker-metadata-tile.lo tracker-tag-bar.lo \
-@@ -316,7 +315,7 @@
+@@ -355,7 +354,7 @@
  	tracker-keyword-store.c
  
  libtracker_gtk_la_LIBADD = \
--	$(top_builddir)/src/libtracker/libtrackerclient.la \
-+	-ltrackerclient \
- 	$(LIBTRACKERGTK_LIBS) 
+-	$(top_builddir)/src/libtracker/libtrackerclient.la 	\
++	-ltrackerclient 	\
+ 	$(LIBTRACKERGTK_LIBS) 					\
+ 	$(GCOV_LIBS)
  
- libtracker_gtk_la_LDFLAGS = -version-info 0:0:0
diff --git a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in b/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in
deleted file mode 100644
index ee9e1903a1a4..000000000000
--- a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/text-filters/Makefile.in.orig	2008-03-03 13:14:00.000000000 +0900
-+++ ./src/text-filters/Makefile.in	2008-08-22 21:40:00.000000000 +0900
-@@ -266,7 +266,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = ooo_converter
-+#SUBDIRS = ooo_converter
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
index f964d78ce7f3..e00d83cf4e40 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
@@ -1,19 +1,22 @@
---- src/tracker-applet/Makefile.in.orig	2008-03-30 16:20:32.345933535 -0400
-+++ src/tracker-applet/Makefile.in	2008-03-30 16:20:52.759690870 -0400
-@@ -55,7 +55,6 @@
+--- src/tracker-applet/Makefile.in.orig	2009-08-08 17:11:05.000000000 +0000
++++ src/tracker-applet/Makefile.in	2009-08-08 17:12:21.000000000 +0000
+@@ -65,8 +65,6 @@
  tracker_applet_OBJECTS = $(am_tracker_applet_OBJECTS)
  am__DEPENDENCIES_1 =
  tracker_applet_DEPENDENCIES =  \
 -	$(top_builddir)/src/libtracker/libtrackerclient.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -312,7 +311,7 @@
- 	tracker-applet-marshallers.h
+-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -345,8 +343,8 @@
+ 	$(GCOV_CFLAGS)
  
  tracker_applet_LDADD = \
--	$(top_builddir)/src/libtracker/libtrackerclient.la \
-+	-ltrackerclient \
- 	$(LIBGLADE_LIBS) \
- 	$(TRACKERAPPLET_LIBS)
- 
+-	$(top_builddir)/src/libtracker/libtrackerclient.la 		\
+-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
++	-ltrackerclient 		\
++	-ltracker-common 	\
+ 	$(TRACKER_APPLET_LIBS)						\
+ 	$(LIBGLADE_LIBS)						\
+ 	$(GCOV_LIBS)
diff --git a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
index acbe9556b169..76095e88bcad 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
@@ -1,21 +1,22 @@
---- src/tracker-preferences/Makefile.in.orig	2008-03-30 16:28:05.657537943 -0400
-+++ src/tracker-preferences/Makefile.in	2008-03-30 16:29:01.927868390 -0400
-@@ -59,8 +59,7 @@
+--- src/tracker-preferences/Makefile.in.orig	2009-08-08 17:13:03.000000000 +0000
++++ src/tracker-preferences/Makefile.in	2009-08-08 17:14:08.000000000 +0000
+@@ -67,8 +67,6 @@
  tracker_preferences_OBJECTS = $(am_tracker_preferences_OBJECTS)
  am__DEPENDENCIES_1 =
- tracker_preferences_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(top_builddir)/src/libtracker/libtrackerclient.la
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -329,7 +328,7 @@
- 			    $(GTK2_LIBS) \
- 			    $(LIBGLADE_LIBS) \
- 				$(DBUS_LIBS) \
--				$(top_builddir)/src/libtracker/libtrackerclient.la \
-+				-ltrackerclient \
- 			    $(NULL)
+ tracker_preferences_DEPENDENCIES =  \
+-	$(top_builddir)/src/libtracker/libtrackerclient.la \
+-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -361,8 +359,8 @@
+ 	tracker-preferences-utils.h
  
- EXTRA_DIST = $(pkgdata_DATA)
+ tracker_preferences_LDADD = \
+-	$(top_builddir)/src/libtracker/libtrackerclient.la		\
+-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
++	-ltrackerclient		\
++	-ltracker-common 	\
+ 	$(LIBGLADE_LIBS)						\
+ 	$(GTK2_LIBS) 							\
+ 	$(DBUS_LIBS) 							\
diff --git a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
index 67de120b0227..0130754f0431 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
@@ -1,23 +1,24 @@
---- src/tracker-search-tool/Makefile.in.orig	2008-03-30 16:33:18.729811374 -0400
-+++ src/tracker-search-tool/Makefile.in	2008-03-30 16:33:36.248603008 -0400
-@@ -57,9 +57,7 @@
- am__DEPENDENCIES_1 =
+--- src/tracker-search-tool/Makefile.in.orig	2009-08-08 17:14:44.000000000 +0000
++++ src/tracker-search-tool/Makefile.in	2009-08-08 17:15:51.000000000 +0000
+@@ -69,9 +69,7 @@
  tracker_search_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) \
 -	$(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
 -	$(top_builddir)/src/libtracker/libtrackerclient.la
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -327,8 +325,7 @@
- 	$(GNOMEVFS_LIBS)    \
- 	$(GNOMEDESKTOP_LIBS) \
- 	$(DBUS_LIBS)	\
--        $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
+@@ -367,8 +365,8 @@
+ 	$(GCOV_LIBS)    						\
+ 	$(GNOMEDESKTOP_LIBS) 					\
+ 	$(DBUS_LIBS)						\
+-        $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la 	\
 -	$(top_builddir)/src/libtracker/libtrackerclient.la 
-+	-ltracker-gtk -ltrackerclient
++        -ltracker-gtk 	\
++	-ltrackerclient 
  
- desktop_in_files = tracker-search-tool.desktop.in
- desktop_files = $(desktop_in_files:.desktop.in=.desktop)
+ desktopdir = $(datadir)/applications
+ desktop_DATA = tracker-search-tool.desktop
diff --git a/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c b/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c
deleted file mode 100644
index 132346af41a9..000000000000
--- a/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/trackerd/tracker-utils.c.orig	2007-08-05 01:53:12.000000000 +0400
-+++ src/trackerd/tracker-utils.c	2007-08-24 22:31:05.000000000 +0400
-@@ -727,10 +727,7 @@
- 		tm.tm_sec = strtoul (timestamp, (char **)&timestamp, 10);
- 	}
- 
--	tt = mktime (&tm);
--        /* mktime() always assumes that "tm" is in locale time but
--           we want to keep control on time, so we go to UTC */
--        tt -= timezone;
-+	tt = timegm (&tm);
- 
- 	if (*timestamp == '+' || *timestamp == '-') {
- 		int sign;
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
index 3daea5a6c3ba..e55381d7c1de 100644
--- a/sysutils/tracker-client/pkg-plist
+++ b/sysutils/tracker-client/pkg-plist
@@ -1,15 +1,36 @@
-bin/tracker-extract
 bin/tracker-files
+bin/tracker-info
 bin/tracker-meta-folder
+bin/tracker-processes
 bin/tracker-query
 bin/tracker-search
+bin/tracker-services
 bin/tracker-stats
 bin/tracker-status
 bin/tracker-tag
-bin/tracker-thumbnailer
-bin/trackerd
+bin/tracker-unique
 etc/xdg/autostart/trackerd.desktop
-include/tracker-client.h
+include/tracker-1.0/libtracker-common/tracker-common.h
+include/tracker-1.0/libtracker-common/tracker-config.h
+include/tracker-1.0/libtracker-common/tracker-field.h
+include/tracker-1.0/libtracker-common/tracker-file-utils.h
+include/tracker-1.0/libtracker-common/tracker-language.h
+include/tracker-1.0/libtracker-common/tracker-module-config.h
+include/tracker-1.0/libtracker-common/tracker-ontology.h
+include/tracker-1.0/libtracker-common/tracker-parser.h
+include/tracker-1.0/libtracker-common/tracker-service.h
+include/tracker-1.0/libtracker-common/tracker-type-utils.h
+include/tracker-1.0/libtracker-common/tracker-utils.h
+include/tracker-1.0/libtracker-module/tracker-module-file.h
+include/tracker-1.0/libtracker-module/tracker-module-iteratable.h
+include/tracker-1.0/libtracker-module/tracker-module-metadata-utils.h
+include/tracker-1.0/libtracker-module/tracker-module-metadata.h
+include/tracker-1.0/libtracker-module/tracker-module.h
+include/tracker-daemon-glue.h
+include/tracker-files-glue.h
+include/tracker-keywords-glue.h
+include/tracker-metadata-glue.h
+include/tracker-search-glue.h
 include/tracker.h
 lib/libtrackerclient.a
 lib/libtrackerclient.la
@@ -18,39 +39,39 @@ lib/libtrackerclient.so.0
 lib/tracker/extract-modules/libextract-abw.a
 lib/tracker/extract-modules/libextract-abw.la
 lib/tracker/extract-modules/libextract-abw.so
-lib/tracker/extract-modules/libextract-exif.a
-lib/tracker/extract-modules/libextract-exif.la
-lib/tracker/extract-modules/libextract-exif.so
 lib/tracker/extract-modules/libextract-gstreamer.a
 lib/tracker/extract-modules/libextract-gstreamer.la
 lib/tracker/extract-modules/libextract-gstreamer.so
 lib/tracker/extract-modules/libextract-html.a
 lib/tracker/extract-modules/libextract-html.la
 lib/tracker/extract-modules/libextract-html.so
-lib/tracker/extract-modules/libextract-imagemagick.a
-lib/tracker/extract-modules/libextract-imagemagick.la
-lib/tracker/extract-modules/libextract-imagemagick.so
+lib/tracker/extract-modules/libextract-jpeg.a
+lib/tracker/extract-modules/libextract-jpeg.la
+lib/tracker/extract-modules/libextract-jpeg.so
 lib/tracker/extract-modules/libextract-mp3.a
 lib/tracker/extract-modules/libextract-mp3.la
 lib/tracker/extract-modules/libextract-mp3.so
-lib/tracker/extract-modules/libextract-mplayer.a
-lib/tracker/extract-modules/libextract-mplayer.la
-lib/tracker/extract-modules/libextract-mplayer.so
 lib/tracker/extract-modules/libextract-oasis.a
 lib/tracker/extract-modules/libextract-oasis.la
 lib/tracker/extract-modules/libextract-oasis.so
 lib/tracker/extract-modules/libextract-pdf.a
 lib/tracker/extract-modules/libextract-pdf.la
 lib/tracker/extract-modules/libextract-pdf.so
+lib/tracker/extract-modules/libextract-playlist.a
+lib/tracker/extract-modules/libextract-playlist.la
+lib/tracker/extract-modules/libextract-playlist.so
 lib/tracker/extract-modules/libextract-png.a
 lib/tracker/extract-modules/libextract-png.la
 lib/tracker/extract-modules/libextract-png.so
 lib/tracker/extract-modules/libextract-ps.a
 lib/tracker/extract-modules/libextract-ps.la
 lib/tracker/extract-modules/libextract-ps.so
-lib/tracker/extract-modules/libextract-totem.a
-lib/tracker/extract-modules/libextract-totem.la
-lib/tracker/extract-modules/libextract-totem.so
+lib/tracker/extract-modules/libextract-tiff.a
+lib/tracker/extract-modules/libextract-tiff.la
+lib/tracker/extract-modules/libextract-tiff.so
+lib/tracker/extract-modules/libextract-vorbis.a
+lib/tracker/extract-modules/libextract-vorbis.la
+lib/tracker/extract-modules/libextract-vorbis.so
 lib/tracker/extract-modules/libextract-xmp.a
 lib/tracker/extract-modules/libextract-xmp.la
 lib/tracker/extract-modules/libextract-xmp.so
@@ -83,17 +104,101 @@ lib/tracker/filters/text/tab-separated-values_filter
 lib/tracker/filters/text/x-comma-separated-values_filter
 lib/tracker/filters/text/x-tex_filter
 lib/tracker/filters/text/xml_filter
-lib/tracker/thumbnailers/application/pdf_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer
-lib/tracker/thumbnailers/image/gif_thumbnailer
-lib/tracker/thumbnailers/image/jpeg_thumbnailer
-lib/tracker/thumbnailers/image/png_thumbnailer
-lib/tracker/thumbnailers/image/tiff_thumbnailer
+lib/tracker/indexer-modules/libtracker-module-applications.a
+lib/tracker/indexer-modules/libtracker-module-applications.la
+lib/tracker/indexer-modules/libtracker-module-applications.so
+lib/tracker/indexer-modules/libtracker-module-evolution.a
+lib/tracker/indexer-modules/libtracker-module-evolution.la
+lib/tracker/indexer-modules/libtracker-module-evolution.so
+lib/tracker/indexer-modules/libtracker-module-files.a
+lib/tracker/indexer-modules/libtracker-module-files.la
+lib/tracker/indexer-modules/libtracker-module-files.so
+lib/tracker/indexer-modules/libtracker-module-gaim-conversations.a
+lib/tracker/indexer-modules/libtracker-module-gaim-conversations.la
+lib/tracker/indexer-modules/libtracker-module-gaim-conversations.so
+lib/tracker/libstemmer.a
+lib/tracker/libstemmer.la
+lib/tracker/libstemmer.so
+lib/tracker/libstemmer.so.0
+lib/tracker/libtracker-common.a
+lib/tracker/libtracker-common.la
+lib/tracker/libtracker-common.so
+lib/tracker/libtracker-common.so.0
+lib/tracker/libtracker-data.a
+lib/tracker/libtracker-data.la
+lib/tracker/libtracker-data.so
+lib/tracker/libtracker-data.so.0
+lib/tracker/libtracker-db.a
+lib/tracker/libtracker-db.la
+lib/tracker/libtracker-db.so
+lib/tracker/libtracker-db.so.0
+lib/tracker/libtracker-module.a
+lib/tracker/libtracker-module.la
+lib/tracker/libtracker-module.so
+lib/tracker/libtracker-module.so.0
+libdata/pkgconfig/tracker-module-1.0.pc
 libdata/pkgconfig/tracker.pc
-share/dbus-1/services/tracker.service
+libexec/tracker-extract
+libexec/tracker-indexer
+libexec/trackerd
+share/dbus-1/services/org.freedesktop.Tracker.Extract.service
+share/dbus-1/services/org.freedesktop.Tracker.Indexer.service
+share/dbus-1/services/org.freedesktop.Tracker.service
+share/doc/libtracker-common/ch01.html
+share/doc/libtracker-common/ch02.html
+share/doc/libtracker-common/ch03.html
+share/doc/libtracker-common/ch04.html
+share/doc/libtracker-common/ch05.html
+share/doc/libtracker-common/home.png
+share/doc/libtracker-common/index.html
+share/doc/libtracker-common/index.sgml
+share/doc/libtracker-common/left.png
+share/doc/libtracker-common/libtracker-common-Config.html
+share/doc/libtracker-common/libtracker-common-DBus.html
+share/doc/libtracker-common/libtracker-common-Fields.html
+share/doc/libtracker-common/libtracker-common-File-Operations.html
+share/doc/libtracker-common/libtracker-common-General.html
+share/doc/libtracker-common/libtracker-common-HAL.html
+share/doc/libtracker-common/libtracker-common-IO-Priority.html
+share/doc/libtracker-common/libtracker-common-Language.html
+share/doc/libtracker-common/libtracker-common-Logging.html
+share/doc/libtracker-common/libtracker-common-Module-Config.html
+share/doc/libtracker-common/libtracker-common-NFS-Locking.html
+share/doc/libtracker-common/libtracker-common-Ontology.html
+share/doc/libtracker-common/libtracker-common-Parser.html
+share/doc/libtracker-common/libtracker-common-Service.html
+share/doc/libtracker-common/libtracker-common-Type-Conversions.html
+share/doc/libtracker-common/libtracker-common.devhelp
+share/doc/libtracker-common/libtracker-common.devhelp2
+share/doc/libtracker-common/libtracker-common.html
+share/doc/libtracker-common/right.png
+share/doc/libtracker-common/style.css
+share/doc/libtracker-common/up.png
+share/doc/libtracker-module/adding-categories.html
+share/doc/libtracker-module/ch01.html
+share/doc/libtracker-module/ch02.html
+share/doc/libtracker-module/creating-extractor-module-binary.html
+share/doc/libtracker-module/defining-properties.html
+share/doc/libtracker-module/home.png
+share/doc/libtracker-module/how-to-add-an-extractor.html
+share/doc/libtracker-module/index.html
+share/doc/libtracker-module/index.sgml
+share/doc/libtracker-module/installing-an-extractor.html
+share/doc/libtracker-module/integrating-applications.html
+share/doc/libtracker-module/left.png
+share/doc/libtracker-module/libtracker-module-Iteratable-files.html
+share/doc/libtracker-module/libtracker-module-Metadata-Convenience-Fallback-Functions.html
+share/doc/libtracker-module/libtracker-module-Metadata-Object.html
+share/doc/libtracker-module/libtracker-module-Module-files.html
+share/doc/libtracker-module/libtracker-module.devhelp
+share/doc/libtracker-module/libtracker-module.devhelp2
+share/doc/libtracker-module/right.png
+share/doc/libtracker-module/style.css
+share/doc/libtracker-module/testing-an-extractor.html
+share/doc/libtracker-module/tracker-indexer.html
+share/doc/libtracker-module/up.png
+share/doc/libtracker-module/writing-an-extractor.html
+share/doc/libtracker-module/writing-an-indexer-module.html
 share/icons/hicolor/16x16/apps/tracker.png
 share/icons/hicolor/22x22/apps/tracker.png
 share/icons/hicolor/24x24/apps/tracker.png
@@ -101,18 +206,24 @@ share/icons/hicolor/32x32/apps/tracker.png
 share/icons/hicolor/48x48/apps/tracker.png
 share/icons/hicolor/scalable/apps/tracker.svg
 share/locale/ar/LC_MESSAGES/tracker.mo
+share/locale/be/LC_MESSAGES/tracker.mo
 share/locale/be@latin/LC_MESSAGES/tracker.mo
 share/locale/ca/LC_MESSAGES/tracker.mo
+share/locale/cs/LC_MESSAGES/tracker.mo
+share/locale/da/LC_MESSAGES/tracker.mo
 share/locale/de/LC_MESSAGES/tracker.mo
 share/locale/dz/LC_MESSAGES/tracker.mo
+share/locale/el/LC_MESSAGES/tracker.mo
 share/locale/en_GB/LC_MESSAGES/tracker.mo
 share/locale/es/LC_MESSAGES/tracker.mo
 share/locale/et/LC_MESSAGES/tracker.mo
 share/locale/fi/LC_MESSAGES/tracker.mo
 share/locale/fr/LC_MESSAGES/tracker.mo
 share/locale/gl/LC_MESSAGES/tracker.mo
+share/locale/he/LC_MESSAGES/tracker.mo
 share/locale/hu/LC_MESSAGES/tracker.mo
 share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/ja/LC_MESSAGES/tracker.mo
 share/locale/ko/LC_MESSAGES/tracker.mo
 share/locale/lt/LC_MESSAGES/tracker.mo
 share/locale/mk/LC_MESSAGES/tracker.mo
@@ -126,6 +237,7 @@ share/locale/ru/LC_MESSAGES/tracker.mo
 share/locale/sk/LC_MESSAGES/tracker.mo
 share/locale/sl/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
+share/locale/th/LC_MESSAGES/tracker.mo
 share/locale/zh_CN/LC_MESSAGES/tracker.mo
 %%DATADIR%%/languages/stopwords.da
 %%DATADIR%%/languages/stopwords.de
@@ -133,25 +245,33 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
 %%DATADIR%%/languages/stopwords.es
 %%DATADIR%%/languages/stopwords.fi
 %%DATADIR%%/languages/stopwords.fr
+%%DATADIR%%/languages/stopwords.hu
 %%DATADIR%%/languages/stopwords.it
 %%DATADIR%%/languages/stopwords.nb
 %%DATADIR%%/languages/stopwords.nl
 %%DATADIR%%/languages/stopwords.pt
 %%DATADIR%%/languages/stopwords.ru
 %%DATADIR%%/languages/stopwords.sv
+%%DATADIR%%/modules/applications.module
+%%DATADIR%%/modules/evolution.module
+%%DATADIR%%/modules/files.module
+%%DATADIR%%/modules/gaim-conversations.module
 %%DATADIR%%/services/application.metadata
 %%DATADIR%%/services/audio.metadata
+%%DATADIR%%/services/conversation.metadata
 %%DATADIR%%/services/default.metadata
 %%DATADIR%%/services/default.service
 %%DATADIR%%/services/document.metadata
 %%DATADIR%%/services/email.metadata
 %%DATADIR%%/services/file.metadata
 %%DATADIR%%/services/image.metadata
+%%DATADIR%%/services/playlist.metadata
 %%DATADIR%%/services/video.metadata
 %%DATADIR%%/sqlite-cache.sql
+%%DATADIR%%/sqlite-contents.sql
 %%DATADIR%%/sqlite-email.sql
+%%DATADIR%%/sqlite-fulltext.sql
 %%DATADIR%%/sqlite-metadata.sql
-%%DATADIR%%/sqlite-service-stored-procs.sql
 %%DATADIR%%/sqlite-service-triggers.sql
 %%DATADIR%%/sqlite-service-types.sql
 %%DATADIR%%/sqlite-service.sql
@@ -159,21 +279,32 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
 %%DATADIR%%/sqlite-tracker-triggers.sql
 %%DATADIR%%/sqlite-tracker.sql
 %%DATADIR%%/sqlite-user-data.sql
-%%DATADIR%%/tracker-introspect.xml
+%%DATADIR%%/tracker-backup.xml
+%%DATADIR%%/tracker-daemon.xml
+%%DATADIR%%/tracker-extract.xml
+%%DATADIR%%/tracker-files.xml
+%%DATADIR%%/tracker-indexer.xml
+%%DATADIR%%/tracker-keywords.xml
+%%DATADIR%%/tracker-metadata.xml
+%%DATADIR%%/tracker-search.xml
 @dirrm %%DATADIR%%/services
+@dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%/languages
 @dirrm %%DATADIR%%
-@dirrm lib/tracker/thumbnailers/image
-@dirrm lib/tracker/thumbnailers/application
-@dirrm lib/tracker/thumbnailers
-@dirrm lib/tracker/filters/text
-@dirrm lib/tracker/filters/application
-@dirrm lib/tracker/filters
-@dirrm lib/tracker/extract-modules
-@dirrm lib/tracker
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrm share/doc/libtracker-module
+@dirrm share/doc/libtracker-common
+@dirrm lib/tracker/indexer-modules
+@dirrm lib/tracker/filters/text
+@dirrm lib/tracker/filters/application
+@dirrm lib/tracker/filters
+@dirrm lib/tracker/extract-modules
+@dirrm lib/tracker
+@dirrm include/tracker-1.0/libtracker-module
+@dirrm include/tracker-1.0/libtracker-common
+@dirrm include/tracker-1.0