5 files changed, 214 insertions, 599 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index b41739908eb7..d9971788cbc5 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -2,109 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	tracker
-PORTVERSION=	1.6.1
-PORTREVISION=	14
+PORTVERSION=	2.0.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Object database, tag/metadata database, search tool and indexer
 
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libgmime-2.6.so:mail/gmime26 \
-		libhal.so:sysutils/hal \
-		libraptor.so:textproc/raptor \
-		libuuid.so:misc/e2fsprogs-libuuid \
-		libicutu.so:devel/icu \
-		libmediaart-2.0.so:multimedia/libmediaart \
-		librest-0.7.so:devel/librest
-RUN_DEPENDS=	xdg-desktop-icon:devel/xdg-utils \
-		o3totxt:converters/o3read \
-		pdftotext:graphics/poppler-utils \
-		w3m:www/w3m
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
+
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libsoup-2.4.so:devel/libsoup \
+		libjson-glib-1.0.so:devel/json-glib \
+		libicutu.so:devel/icu
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c++11-lib desktop-file-utils gettext gmake gnome \
-		libarchive libtool pathfix pkgconfig python:run shebangfix \
-		sqlite tar:xz
-USE_GNOME=	gtk30 intltool introspection:build libxslt:build
+USES=		compiler:c++11-lib gettext gmake gnome libtool localbase \
+		pathfix pkgconfig python:3.4+,build shebangfix sqlite tar:xz
+USE_GNOME=	glib20 intltool introspection:build libxml2 
 USE_LDCONFIG=	yes
-USE_GSTREAMER1=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
-		--disable-libiptcdata --enable-miner-fs \
-		--disable-meegotouch \
-		--enable-icu-charset-detection \
+CONFIGURE_ARGS=	--disable-static \
 		--disable-network-manager \
-		--disable-enca \
-		--enable-tracker-preferences \
-		--disable-libosinfo \
-		--enable-generic-media-extractor=gstreamer
-# disable evolution miner until tracker fixes the dep
-CONFIGURE_ARGS+=	--disable-miner-evolution
-CONFIGURE_ENV+=		enable_miner_evolution=no \
-			DATADIRNAME=share
+		--with-bash-completion-dir=no
 INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.freedesktop.Tracker.DB.gschema.xml \
-		org.freedesktop.Tracker.Extract.gschema.xml \
 		org.freedesktop.Tracker.FTS.gschema.xml \
-		org.freedesktop.Tracker.Miner.Files.gschema.xml \
-		org.freedesktop.Tracker.Needle.gschema.xml \
 		org.freedesktop.Tracker.Store.gschema.xml \
-		org.freedesktop.Tracker.Writeback.gschema.xml \
 		org.freedesktop.Tracker.enums.xml \
 		org.freedesktop.Tracker.gschema.xml
-SHEBANG_FILES=	tests/tracker-writeback/01-writeback.py
-
-PLIST_SUB=	TRACKER_VER="1.0" LIBVER=601
-
-OPTIONS_DEFINE=		AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS \
-			WEB_MINERS
-OPTIONS_DEFAULT=	AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS
-OPTIONS_SUB=yes
-WEB_MINERS_DESC=	Support for Firefox, Thunderbird
-# and Evolution
-AUDIO_MINERS_DESC=	Support for audio formats
-DOCUMENT_MINERS_DESC=	Support for some sort of documents (pdf, ps, xps, office)
-GRAPHIC_MINERS_DESC=	Support for some graphic formats (gif, png, tiff)
-NAUTILUS_DESC=		Support for nautilus tagging
-
-WEB_MINERS_CONFIGURE_ENABLE=	miner-firefox miner-thunderbird
-# miner-evolution
-WEB_MINERS_BUILD_DEPENDS=	firefox>=0:www/firefox \
-				thunderbird>=0:mail/thunderbird
-WEB_MINERS_RUN_DEPENDS=		firefox>=0:www/firefox \
-				thunderbird>=0:mail/thunderbird
-
-AUDIO_MINERS_CONFIGURE_ENABLE=	libvorbis libflac taglib mp3 libcue playlist
-AUDIO_MINERS_LIB_DEPENDS=	libtotem-plparser.so:multimedia/totem-pl-parser \
-				libFLAC.so:audio/flac \
-				libvorbis.so:audio/libvorbis \
-				libcue.so:textproc/libcue \
-				libogg.so:audio/libogg \
-				libtag.so:audio/taglib
-
-DOCUMENT_MINERS_CONFIGURE_ENABLE=	libgxps poppler libxml2 libgsf \
-				abiword dvi ps exempi text
-DOCUMENT_MINERS_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
-				libgxps.so:graphics/libgxps \
-				libgsf-1.so:devel/libgsf \
-				libexempi.so:textproc/exempi \
-				libwv.so:textproc/wv
+SHEBANG_FILES=	utils/g-ir-merge/g-ir-merge
 
-GRAPHIC_MINERS_CONFIGURE_ENABLE=	libexif libgif libjpeg libtiff icon libpng
-GRAPHIC_MINERS_LIB_DEPENDS=	libexif.so:graphics/libexif \
-				libgif.so:graphics/giflib \
-				libpng.so:graphics/png \
-				libtiff.so:graphics/tiff
+PLIST_SUB=	LIBVER=0.4.0
 
-# cirular dependancy tracker -> nautilus -> tracker
-CONFIGURE_ARGS=		--disable-nautilus-extension
-#NAUTILUS_CONFIGURE_ENABLE=	nautilus-extension
-#NAUTILUS_USE=		GNOME=nautilus3
+# force regen of this file, so the correct tracker version is embedded
+# https://bugzilla.gnome.org/show_bug.cgi?id=792691
+post-patch:
+	@${RM} ${WRKSRC}/src/libtracker-sparql/tracker-sparql.vapi
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index 5f32f9890baf..902d3d06461c 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tracker-1.6.1.tar.xz) = 653ed73f4f454b836df56bec1f1141c7a8d77cbeba97ea1e38df9f60a5f0c1ed
-SIZE (tracker-1.6.1.tar.xz) = 4905544
+TIMESTAMP = 1530382221
+SHA256 (tracker-2.0.4.tar.xz) = ce2f0db52666592d313a04ce14663110eafa8ab08dc213b53e790281362dccd5
+SIZE (tracker-2.0.4.tar.xz) = 2607728
diff --git a/sysutils/tracker/files/patch-configure b/sysutils/tracker/files/patch-configure
deleted file mode 100644
index 5c395589562a..000000000000
--- a/sysutils/tracker/files/patch-configure
+++ /dev/null
@@ -1,128 +0,0 @@
---- configure.orig	2015-07-21 23:39:50.000000000 +0200
-+++ configure	2015-08-14 14:37:54.000000000 +0200
-@@ -21334,8 +21334,6 @@
- # First test for 3_3_5
- TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
-                                         evolution-shell-3.0       >= 3.1
--                                        evolution-plugin-3.0
--                                        libemail-utils
-                                         libemail-engine
-                                         evolution-data-server-1.2 >= $EDS_REQUIRED
-                                         camel-1.2                 >= $CAMEL_REQUIRED"
-@@ -21429,7 +21427,6 @@
- # Second test for 3_2
- TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
-                                       evolution-shell-3.0       >= 3.1
--                                      evolution-plugin-3.0
-                                       evolution-data-server-1.2 >= $EDS_REQUIRED
-                                       camel-1.2                 >= $CAMEL_REQUIRED"
- 
-@@ -21519,7 +21516,6 @@
- # Third test for 2_91
- TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
-                                        evolution-shell-3.0
--                                       evolution-plugin-3.0
-                                        evolution-data-server-1.2 >= $EDS_REQUIRED
-                                        camel-1.2                 >= $CAMEL_REQUIRED"
- 
-@@ -21605,7 +21601,6 @@
- # Fourth test others (do we really want support for anything < 3.2)?
- TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
-                                        evolution-shell           >= $EVO_SHELL_REQUIRED
--                                       evolution-plugin          >= $EVO_REQUIRED
-                                        evolution-data-server-1.2 >= $EDS_REQUIRED
-                                        camel-1.2                 >= $CAMEL_REQUIRED"
- 
-@@ -24247,14 +24242,14 @@
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1      >= \$DBUS_REQUIRED
--                      hal         >= \$HAL_REQUIRED\""; } >&5
-+                      hal         >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1      >= $DBUS_REQUIRED
--                      hal         >= $HAL_REQUIRED") 2>&5
-+                      hal         >= $HAL_REQUIRED dbus-glib-1"; ) >&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "dbus-1      >= $DBUS_REQUIRED
--                      hal         >= $HAL_REQUIRED" 2>/dev/null`
-+                      hal         >= $HAL_REQUIRED dbus-glib-1" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -24267,14 +24262,16 @@
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1      >= \$DBUS_REQUIRED
--                      hal         >= \$HAL_REQUIRED\""; } >&5
-+                      hal         >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1      >= $DBUS_REQUIRED
--                      hal         >= $HAL_REQUIRED") 2>&5
-+                      hal         >= $HAL_REQUIRED
-+		      dbus-glib-1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "dbus-1      >= $DBUS_REQUIRED
--                      hal         >= $HAL_REQUIRED" 2>/dev/null`
-+                      hal         >= $HAL_REQUIRED
-+		      dbus-glib-1" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -24296,10 +24293,12 @@
- fi
-         if test $_pkg_short_errors_supported = yes; then
- 	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1      >= $DBUS_REQUIRED
--                      hal         >= $HAL_REQUIRED" 2>&1`
-+                      hal         >= $HAL_REQUIRED
-+		      dbus-glib-1" 2>&1`
-         else
- 	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1      >= $DBUS_REQUIRED
--                      hal         >= $HAL_REQUIRED" 2>&1`
-+                      hal         >= $HAL_REQUIRED
-+		      dbus-glib-1" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$HAL_PKG_ERRORS" >&5
-@@ -25497,7 +25496,6 @@
- if test "${with_evolution_plugin_dir+set}" = set; then :
-   withval=$with_evolution_plugin_dir;
- fi
--,
-                tracker_miner_evolution_install_dir=$withval,
-                tracker_miner_evolution_install_dir=`$PKG_CONFIG $evolution_plugin_name --variable=plugindir`,
- 
-@@ -27296,7 +27294,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- 
- # Check whether --enable-libgif was given.
-@@ -27406,7 +27403,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- 
- # Check whether --enable-libjpeg was given.
-@@ -27516,7 +27512,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- 
- # Check whether --enable-libtiff was given.
-@@ -27626,7 +27621,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- 
- # Check whether --enable-libpng was given.
diff --git a/sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c b/sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c
deleted file mode 100644
index a297efe1d016..000000000000
--- a/sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/tracker-extract/tracker-cue-sheet.c.orig	2014-10-01 21:11:49 UTC
-+++ src/tracker-extract/tracker-cue-sheet.c
-@@ -30,7 +30,7 @@
- #include <gst/tag/tag.h>
- 
- #if defined(HAVE_LIBCUE)
--#include <libcue/libcue.h>
-+#include <libcue.h>
- #endif
- 
- #include <libtracker-common/tracker-file-utils.h>
-@@ -93,7 +93,7 @@ add_cdtext_string_tag (Cdtext      *cd_t
- 
- static void
- add_cdtext_comment_date_tag (Rem         *cd_comments,
--                             enum Cmt     index,
-+                             enum RemType     index,
-                              GstTagList  *tag_list,
-                              const gchar *tag)
- {
-@@ -116,7 +116,7 @@ add_cdtext_comment_date_tag (Rem        
- 
- static void
- add_cdtext_comment_double_tag (Rem         *cd_comments,
--                               enum Cmt     index,
-+                               enum RemType     index,
-                                GstTagList  *tag_list,
-                                const gchar *tag)
- {
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 981b0477df85..82936a12347a 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -1,134 +1,51 @@
 bin/tracker
-bin/tracker-control
-bin/tracker-import
-bin/tracker-info
-bin/tracker-needle
-bin/tracker-preferences
-bin/tracker-search
-bin/tracker-sparql
-bin/tracker-stats
-bin/tracker-tag
-etc/xdg/autostart/tracker-extract.desktop
-etc/xdg/autostart/tracker-miner-apps.desktop
-etc/xdg/autostart/tracker-miner-fs.desktop
-etc/xdg/autostart/tracker-miner-user-guides.desktop
 etc/xdg/autostart/tracker-store.desktop
-include/tracker-%%TRACKER_VER%%/libtracker-control/tracker-control.h
-include/tracker-%%TRACKER_VER%%/libtracker-control/tracker-miner-manager.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-data-provider.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-decorator-fs.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-decorator.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-enumerator.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-indexing-tree.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-enum-types.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-enums.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-fs.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-object.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-online.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-generated.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-ontologies.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-sparql.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-version.h
-%%WEB_MINERS%%lib/firefox-addons/extensions/trackerfox@bustany.org
-%%WEB_MINERS%%lib/thunderbird-addons/extensions/trackerbird@bustany.org
-lib/girepository-%%TRACKER_VER%%/Tracker-1.0.typelib
-lib/girepository-%%TRACKER_VER%%/TrackerControl-1.0.typelib
-lib/girepository-%%TRACKER_VER%%/TrackerMiner-1.0.typelib
-lib/libtracker-control-%%TRACKER_VER%%.a
-lib/libtracker-control-%%TRACKER_VER%%.so
-lib/libtracker-control-%%TRACKER_VER%%.so.0
-lib/libtracker-control-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
-lib/libtracker-miner-%%TRACKER_VER%%.a
-lib/libtracker-miner-%%TRACKER_VER%%.so
-lib/libtracker-miner-%%TRACKER_VER%%.so.0
-lib/libtracker-miner-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
-lib/libtracker-sparql-%%TRACKER_VER%%.a
-lib/libtracker-sparql-%%TRACKER_VER%%.so
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
-@comment %%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.a
-@comment %%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-bmp.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-bmp.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dummy.a
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dummy.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.a
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.so
-lib/tracker-%%TRACKER_VER%%/libtracker-common.a
-lib/tracker-%%TRACKER_VER%%/libtracker-common.so
-lib/tracker-%%TRACKER_VER%%/libtracker-common.so.0
-lib/tracker-%%TRACKER_VER%%/libtracker-common.so.0.0.0
-lib/tracker-%%TRACKER_VER%%/libtracker-data.a
-lib/tracker-%%TRACKER_VER%%/libtracker-data.so
-lib/tracker-%%TRACKER_VER%%/libtracker-data.so.0
-lib/tracker-%%TRACKER_VER%%/libtracker-data.so.0.0.0
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.a
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.so
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.so.0
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.so.0.0.0
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xps.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xps.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.so
-libdata/pkgconfig/tracker-control-%%TRACKER_VER%%.pc
-libdata/pkgconfig/tracker-miner-%%TRACKER_VER%%.pc
-libdata/pkgconfig/tracker-sparql-%%TRACKER_VER%%.pc
-libexec/tracker-extract
-libexec/tracker-miner-apps
-libexec/tracker-miner-fs
-libexec/tracker-miner-user-guides
+include/tracker-2.0/libtracker-control/tracker-control.h
+include/tracker-2.0/libtracker-control/tracker-miner-manager.h
+include/tracker-2.0/libtracker-miner/tracker-data-provider.h
+include/tracker-2.0/libtracker-miner/tracker-decorator-fs.h
+include/tracker-2.0/libtracker-miner/tracker-decorator.h
+include/tracker-2.0/libtracker-miner/tracker-indexing-tree.h
+include/tracker-2.0/libtracker-miner/tracker-miner-enum-types.h
+include/tracker-2.0/libtracker-miner/tracker-miner-enums.h
+include/tracker-2.0/libtracker-miner/tracker-miner-fs.h
+include/tracker-2.0/libtracker-miner/tracker-miner-object.h
+include/tracker-2.0/libtracker-miner/tracker-miner-online.h
+include/tracker-2.0/libtracker-miner/tracker-miner-proxy.h
+include/tracker-2.0/libtracker-miner/tracker-miner.h
+include/tracker-2.0/libtracker-sparql/tracker-generated.h
+include/tracker-2.0/libtracker-sparql/tracker-namespace-manager.h
+include/tracker-2.0/libtracker-sparql/tracker-notifier.h
+include/tracker-2.0/libtracker-sparql/tracker-ontologies.h
+include/tracker-2.0/libtracker-sparql/tracker-resource.h
+include/tracker-2.0/libtracker-sparql/tracker-sparql.h
+include/tracker-2.0/libtracker-sparql/tracker-version.h
+lib/girepository-1.0/Tracker-2.0.typelib
+lib/girepository-1.0/TrackerControl-2.0.typelib
+lib/girepository-1.0/TrackerMiner-2.0.typelib
+lib/libtracker-control-2.0.so
+lib/libtracker-control-2.0.so.0
+lib/libtracker-control-2.0.so.%%LIBVER%%
+lib/libtracker-miner-2.0.so
+lib/libtracker-miner-2.0.so.0
+lib/libtracker-miner-2.0.so.%%LIBVER%%
+lib/libtracker-sparql-2.0.so
+lib/libtracker-sparql-2.0.so.0
+lib/libtracker-sparql-2.0.so.%%LIBVER%%
+@comment lib/systemd/user/tracker-store.service
+lib/tracker-2.0/libtracker-common.so
+lib/tracker-2.0/libtracker-common.so.0
+lib/tracker-2.0/libtracker-common.so.0.0.0
+lib/tracker-2.0/libtracker-data.so
+lib/tracker-2.0/libtracker-data.so.0
+lib/tracker-2.0/libtracker-data.so.0.0.0
+libdata/pkgconfig/tracker-control-2.0.pc
+libdata/pkgconfig/tracker-miner-2.0.pc
+libdata/pkgconfig/tracker-sparql-2.0.pc
 libexec/tracker-store
-libexec/tracker-writeback
 man/man1/tracker-daemon.1.gz
-man/man1/tracker-extract.1.gz
 man/man1/tracker-index.1.gz
 man/man1/tracker-info.1.gz
-man/man1/tracker-miner-fs.1.gz
-man/man1/tracker-needle.1.gz
-man/man1/tracker-preferences.1.gz
 man/man1/tracker-reset.1.gz
 man/man1/tracker-search.1.gz
 man/man1/tracker-sparql.1.gz
@@ -136,105 +53,125 @@ man/man1/tracker-sql.1.gz
 man/man1/tracker-status.1.gz
 man/man1/tracker-store.1.gz
 man/man1/tracker-tag.1.gz
-man/man1/tracker-writeback.1.gz
-man/man5/tracker-db.cfg.5.gz
-man/man5/tracker-extract.cfg.5.gz
-man/man5/tracker-fts.cfg.5.gz
-man/man5/tracker-miner-fs.cfg.5.gz
-man/man5/tracker-store.cfg.5.gz
-man/man5/tracker-writeback.cfg.5.gz
-share/appdata/tracker-needle.appdata.xml
-share/appdata/tracker-preferences.appdata.xml
-share/applications/tracker-needle.desktop
-share/applications/tracker-preferences.desktop
-%%WEB_MINERS%%share/applications/trackerbird-launcher.desktop
-share/bash-completion/completions/tracker
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Applications.service
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Files.service
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Userguides.service
-share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service
 share/dbus-1/services/org.freedesktop.Tracker1.service
-share/gir-%%TRACKER_VER%%/Tracker-1.0.gir
-share/gir-%%TRACKER_VER%%/TrackerControl-1.0.gir
-share/gir-%%TRACKER_VER%%/TrackerMiner-1.0.gir
-share/gtk-doc/html/libtracker-control/libtracker-miner-reference.html
-share/gtk-doc/html/libtracker-control/home.png
-share/gtk-doc/html/libtracker-control/ch01.html
-share/gtk-doc/html/libtracker-control/style.css
-share/gtk-doc/html/libtracker-control/right-insensitive.png
-share/gtk-doc/html/libtracker-control/up.png
-share/gtk-doc/html/libtracker-control/libtracker-control.devhelp2
-share/gtk-doc/html/libtracker-control/up-insensitive.png
-share/gtk-doc/html/libtracker-control/left-insensitive.png
+share/gir-1.0/Tracker-2.0.gir
+share/gir-1.0/TrackerControl-2.0.gir
+share/gir-1.0/TrackerMiner-2.0.gir
 share/gtk-doc/html/libtracker-control/TrackerMinerManager.html
-share/gtk-doc/html/libtracker-control/right.png
-share/gtk-doc/html/libtracker-control/left.png
 share/gtk-doc/html/libtracker-control/annotation-glossary.html
+share/gtk-doc/html/libtracker-control/ch01.html
+share/gtk-doc/html/libtracker-control/home.png
 share/gtk-doc/html/libtracker-control/index.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerFileEnumerator.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerEnumerator.html
-share/gtk-doc/html/libtracker-miner/up-insensitive.png
+share/gtk-doc/html/libtracker-control/left-insensitive.png
+share/gtk-doc/html/libtracker-control/left.png
+share/gtk-doc/html/libtracker-control/libtracker-control.devhelp2
+share/gtk-doc/html/libtracker-control/libtracker-miner-reference.html
+share/gtk-doc/html/libtracker-control/right-insensitive.png
+share/gtk-doc/html/libtracker-control/right.png
+share/gtk-doc/html/libtracker-control/style.css
+share/gtk-doc/html/libtracker-control/tracker-migrating-1-to-2.html
+share/gtk-doc/html/libtracker-control/up-insensitive.png
+share/gtk-doc/html/libtracker-control/up.png
+share/gtk-doc/html/libtracker-miner/TrackerDataProvider.html
 share/gtk-doc/html/libtracker-miner/TrackerDecorator.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerFileDataProvider.html
+share/gtk-doc/html/libtracker-miner/TrackerDecoratorFS.html
+share/gtk-doc/html/libtracker-miner/TrackerIndexingTree.html
+share/gtk-doc/html/libtracker-miner/TrackerMiner.html
+share/gtk-doc/html/libtracker-miner/TrackerMinerFS.html
+share/gtk-doc/html/libtracker-miner/TrackerMinerOnline.html
+share/gtk-doc/html/libtracker-miner/TrackerMinerProxy.html
+share/gtk-doc/html/libtracker-miner/annotation-glossary.html
 share/gtk-doc/html/libtracker-miner/ch02.html
-share/gtk-doc/html/libtracker-miner/left-insensitive.png
-share/gtk-doc/html/libtracker-miner/libtracker-miner-reference.html
-share/gtk-doc/html/libtracker-miner/home.png
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerThumbnailer.html
 share/gtk-doc/html/libtracker-miner/ch03.html
+share/gtk-doc/html/libtracker-miner/ch04.html
+share/gtk-doc/html/libtracker-miner/ch05s02.html
+share/gtk-doc/html/libtracker-miner/ch05s03.html
+share/gtk-doc/html/libtracker-miner/ch05s04.html
+share/gtk-doc/html/libtracker-miner/ch05s05.html
+share/gtk-doc/html/libtracker-miner/ch05s06.html
+share/gtk-doc/html/libtracker-miner/ch05s07.html
+share/gtk-doc/html/libtracker-miner/home.png
 share/gtk-doc/html/libtracker-miner/index.html
-share/gtk-doc/html/libtracker-miner/right.png
-share/gtk-doc/html/libtracker-miner/libtracker-miner-Media-art-management.html
+share/gtk-doc/html/libtracker-miner/left-insensitive.png
+share/gtk-doc/html/libtracker-miner/left.png
 share/gtk-doc/html/libtracker-miner/libtracker-miner-Enumerations.html
+share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerFileDataProvider.html
+share/gtk-doc/html/libtracker-miner/libtracker-miner-reference.html
+share/gtk-doc/html/libtracker-miner/libtracker-miner.devhelp2
 share/gtk-doc/html/libtracker-miner/right-insensitive.png
-share/gtk-doc/html/libtracker-miner/ch05.html
+share/gtk-doc/html/libtracker-miner/right.png
 share/gtk-doc/html/libtracker-miner/style.css
+share/gtk-doc/html/libtracker-miner/tracker-migrating-1-to-2.html
 share/gtk-doc/html/libtracker-miner/tracker-overview-compiling.html
-share/gtk-doc/html/libtracker-miner/TrackerMiner.html
-share/gtk-doc/html/libtracker-miner/left.png
-share/gtk-doc/html/libtracker-miner/TrackerMinerFS.html
-share/gtk-doc/html/libtracker-miner/annotation-glossary.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner.devhelp2
-share/gtk-doc/html/libtracker-miner/TrackerMinerOnline.html
 share/gtk-doc/html/libtracker-miner/tracker-overview.html
-share/gtk-doc/html/libtracker-miner/ch04.html
-share/gtk-doc/html/libtracker-miner/TrackerDecoratorFS.html
+share/gtk-doc/html/libtracker-miner/up-insensitive.png
 share/gtk-doc/html/libtracker-miner/up.png
-share/gtk-doc/html/libtracker-miner/TrackerIndexingTree.html
-share/gtk-doc/html/libtracker-miner/TrackerDataProvider.html
-share/gtk-doc/html/libtracker-sparql/tracker-examples-readonly.html
+share/gtk-doc/html/libtracker-sparql/TrackerNotifier.html
+share/gtk-doc/html/libtracker-sparql/TrackerResource.html
+share/gtk-doc/html/libtracker-sparql/TrackerSparqlBuilder.html
+share/gtk-doc/html/libtracker-sparql/TrackerSparqlConnection.html
+share/gtk-doc/html/libtracker-sparql/TrackerSparqlCursor.html
+share/gtk-doc/html/libtracker-sparql/accompanying-metadata.html
+share/gtk-doc/html/libtracker-sparql/annotation-glossary.html
+share/gtk-doc/html/libtracker-sparql/base-ontology.html
+share/gtk-doc/html/libtracker-sparql/ch18s02.html
+share/gtk-doc/html/libtracker-sparql/ch18s03.html
+share/gtk-doc/html/libtracker-sparql/creating-ontology.html
+share/gtk-doc/html/libtracker-sparql/dc-ontology.html
+share/gtk-doc/html/libtracker-sparql/defining-cardinality.html
+share/gtk-doc/html/libtracker-sparql/defining-classes.html
+share/gtk-doc/html/libtracker-sparql/defining-fts-indexes.html
+share/gtk-doc/html/libtracker-sparql/defining-indexes.html
+share/gtk-doc/html/libtracker-sparql/defining-properties.html
+share/gtk-doc/html/libtracker-sparql/defining-uniqueness.html
+share/gtk-doc/html/libtracker-sparql/home.png
+share/gtk-doc/html/libtracker-sparql/index.html
 share/gtk-doc/html/libtracker-sparql/left-insensitive.png
-share/gtk-doc/html/libtracker-sparql/tracker-examples-builder.html
-share/gtk-doc/html/libtracker-sparql/up.png
-share/gtk-doc/html/libtracker-sparql/tracker-overview-compiling.html
-share/gtk-doc/html/libtracker-sparql/tracker-examples.html
 share/gtk-doc/html/libtracker-sparql/left.png
-share/gtk-doc/html/libtracker-sparql/libtracker-sparql-Version-Information.html
-share/gtk-doc/html/libtracker-sparql/tracker-overview-environment-variables.html
-share/gtk-doc/html/libtracker-sparql/style.css
-share/gtk-doc/html/libtracker-sparql/tracker-overview-connection-methods.html
-share/gtk-doc/html/libtracker-sparql/index.html
-share/gtk-doc/html/libtracker-sparql/tracker-examples-writeonly-with-blank-nodes.html
-share/gtk-doc/html/libtracker-sparql/TrackerSparqlBuilder.html
+share/gtk-doc/html/libtracker-sparql/libtracker-sparql-TrackerNamespaceManager.html
 share/gtk-doc/html/libtracker-sparql/libtracker-sparql-Utilities.html
-share/gtk-doc/html/libtracker-sparql/annotation-glossary.html
-share/gtk-doc/html/libtracker-sparql/TrackerSparqlCursor.html
-share/gtk-doc/html/libtracker-sparql/right.png
-share/gtk-doc/html/libtracker-sparql/up-insensitive.png
+share/gtk-doc/html/libtracker-sparql/libtracker-sparql-Version-Information.html
 share/gtk-doc/html/libtracker-sparql/libtracker-sparql-reference.html
-share/gtk-doc/html/libtracker-sparql/home.png
+share/gtk-doc/html/libtracker-sparql/libtracker-sparql.devhelp2
+share/gtk-doc/html/libtracker-sparql/nao-Tag.html
+share/gtk-doc/html/libtracker-sparql/nao-ontology.html
+share/gtk-doc/html/libtracker-sparql/nrl-InverseFunctionalProperty.html
+share/gtk-doc/html/libtracker-sparql/nrl-ontology.html
+share/gtk-doc/html/libtracker-sparql/predefined-elements.html
+share/gtk-doc/html/libtracker-sparql/private-daemons.html
+share/gtk-doc/html/libtracker-sparql/rdf-Property.html
+share/gtk-doc/html/libtracker-sparql/rdf-ontology.html
+share/gtk-doc/html/libtracker-sparql/rdfs-Class.html
+share/gtk-doc/html/libtracker-sparql/rdfs-Literal.html
+share/gtk-doc/html/libtracker-sparql/rdfs-Resource.html
+share/gtk-doc/html/libtracker-sparql/recommendations.html
 share/gtk-doc/html/libtracker-sparql/right-insensitive.png
-share/gtk-doc/html/libtracker-sparql/tracker-overview.html
-share/gtk-doc/html/libtracker-sparql/TrackerSparqlConnection.html
+share/gtk-doc/html/libtracker-sparql/right.png
+share/gtk-doc/html/libtracker-sparql/style.css
+share/gtk-doc/html/libtracker-sparql/tracker-Namespace.html
+share/gtk-doc/html/libtracker-sparql/tracker-Ontology.html
+share/gtk-doc/html/libtracker-sparql/tracker-examples-builder.html
+share/gtk-doc/html/libtracker-sparql/tracker-examples-readonly.html
+share/gtk-doc/html/libtracker-sparql/tracker-examples-writeonly-with-blank-nodes.html
 share/gtk-doc/html/libtracker-sparql/tracker-examples-writeonly.html
-share/gtk-doc/html/libtracker-sparql/libtracker-sparql.devhelp2
-share/icons/hicolor/16x16/apps/tracker.png
-share/icons/hicolor/22x22/apps/tracker.png
-share/icons/hicolor/24x24/apps/tracker.png
-share/icons/hicolor/32x32/apps/tracker.png
-share/icons/hicolor/48x48/apps/tracker.png
-share/icons/hicolor/scalable/apps/tracker.svg
+share/gtk-doc/html/libtracker-sparql/tracker-examples.html
+share/gtk-doc/html/libtracker-sparql/tracker-migrating-1-to-2.html
+share/gtk-doc/html/libtracker-sparql/tracker-ontologies.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview-compiling.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview-connection-methods.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview-environment-variables.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview.html
+share/gtk-doc/html/libtracker-sparql/tracker-private-store.html
+share/gtk-doc/html/libtracker-sparql/up-insensitive.png
+share/gtk-doc/html/libtracker-sparql/up.png
+share/gtk-doc/html/libtracker-sparql/updating-ontology.html
+share/gtk-doc/html/libtracker-sparql/xsd-boolean.html
+share/gtk-doc/html/libtracker-sparql/xsd-date.html
+share/gtk-doc/html/libtracker-sparql/xsd-dateTime.html
+share/gtk-doc/html/libtracker-sparql/xsd-double.html
+share/gtk-doc/html/libtracker-sparql/xsd-integer.html
+share/gtk-doc/html/libtracker-sparql/xsd-ontology.html
+share/gtk-doc/html/libtracker-sparql/xsd-string.html
 share/locale/ar/LC_MESSAGES/tracker.mo
 share/locale/as/LC_MESSAGES/tracker.mo
 share/locale/be@latin/LC_MESSAGES/tracker.mo
@@ -254,12 +191,16 @@ share/locale/et/LC_MESSAGES/tracker.mo
 share/locale/eu/LC_MESSAGES/tracker.mo
 share/locale/fi/LC_MESSAGES/tracker.mo
 share/locale/fr/LC_MESSAGES/tracker.mo
+share/locale/fur/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/hr/LC_MESSAGES/tracker.mo
 share/locale/id/LC_MESSAGES/tracker.mo
 share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/is/LC_MESSAGES/tracker.mo
 share/locale/ja/LC_MESSAGES/tracker.mo
+share/locale/kk/LC_MESSAGES/tracker.mo
 share/locale/ko/LC_MESSAGES/tracker.mo
 share/locale/lt/LC_MESSAGES/tracker.mo
 share/locale/lv/LC_MESSAGES/tracker.mo
@@ -267,6 +208,7 @@ share/locale/mk/LC_MESSAGES/tracker.mo
 share/locale/ml/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
 share/locale/nds/LC_MESSAGES/tracker.mo
+share/locale/ne/LC_MESSAGES/tracker.mo
 share/locale/nl/LC_MESSAGES/tracker.mo
 share/locale/oc/LC_MESSAGES/tracker.mo
 share/locale/pa/LC_MESSAGES/tracker.mo
@@ -285,94 +227,43 @@ share/locale/tg/LC_MESSAGES/tracker.mo
 share/locale/th/LC_MESSAGES/tracker.mo
 share/locale/tr/LC_MESSAGES/tracker.mo
 share/locale/uk/LC_MESSAGES/tracker.mo
+share/locale/vi/LC_MESSAGES/tracker.mo
 share/locale/zh_CN/LC_MESSAGES/tracker.mo
 share/locale/zh_HK/LC_MESSAGES/tracker.mo
 share/locale/zh_TW/LC_MESSAGES/tracker.mo
-%%DATADIR%%/tracker-backup.xml
-%%DATADIR%%/tracker-extract-priority.xml
-%%DATADIR%%/tracker-extract.xml
-%%DATADIR%%/tracker-miner-files-index.xml
-%%DATADIR%%/tracker-miner.xml
-%%DATADIR%%/tracker-needle.ui
-%%DATADIR%%/tracker-preferences.ui
-%%DATADIR%%/tracker-resources.xml
-%%DATADIR%%/tracker-statistics.xml
-%%DATADIR%%/tracker-status.xml
-%%DATADIR%%/tracker-writeback.xml
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-abw.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-bmp.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-comics.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-dvi.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-ebooks.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-epub.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/10-flac.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-gif.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-html.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-ico.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-jpeg.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/10-mp3.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-msoffice.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-oasis.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-pdf.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-png.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-ps.rule
-%%DATADIR%%/extract-rules/10-svg.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-tiff.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/10-vorbis.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-xmp.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-xps.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/11-msoffice-xml.rule
-%%DATADIR%%/extract-rules/15-gstreamer-guess.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/15-playlist.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/15-source-code.rule
-%%DATADIR%%/extract-rules/90-gstreamer-audio-generic.rule
-%%DATADIR%%/extract-rules/90-gstreamer-image-generic.rule
-%%DATADIR%%/extract-rules/90-gstreamer-video-generic.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/90-text-generic.rule
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Applications.service
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Extract.service
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Files.service
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Userguides.service
-%%DATADIR%%/ontologies/10-xsd.description
-%%DATADIR%%/ontologies/10-xsd.ontology
-%%DATADIR%%/ontologies/11-rdf.description
-%%DATADIR%%/ontologies/11-rdf.ontology
-%%DATADIR%%/ontologies/12-nrl.description
-%%DATADIR%%/ontologies/12-nrl.ontology
-%%DATADIR%%/ontologies/20-dc.description
-%%DATADIR%%/ontologies/20-dc.ontology
-%%DATADIR%%/ontologies/30-nie.description
-%%DATADIR%%/ontologies/30-nie.ontology
-%%DATADIR%%/ontologies/31-nao.description
-%%DATADIR%%/ontologies/31-nao.ontology
-%%DATADIR%%/ontologies/32-nco.description
-%%DATADIR%%/ontologies/32-nco.ontology
-%%DATADIR%%/ontologies/33-nfo.description
-%%DATADIR%%/ontologies/33-nfo.ontology
-%%DATADIR%%/ontologies/34-nmo.description
-%%DATADIR%%/ontologies/34-nmo.ontology
-%%DATADIR%%/ontologies/35-ncal.description
-%%DATADIR%%/ontologies/35-ncal.ontology
-%%DATADIR%%/ontologies/36-scal.description
-%%DATADIR%%/ontologies/36-scal.ontology
-%%DATADIR%%/ontologies/37-nid3.description
-%%DATADIR%%/ontologies/37-nid3.ontology
-%%DATADIR%%/ontologies/38-nmm.description
-%%DATADIR%%/ontologies/38-nmm.ontology
-%%DATADIR%%/ontologies/39-mto.description
-%%DATADIR%%/ontologies/39-mto.ontology
-%%DATADIR%%/ontologies/40-mlo.description
-%%DATADIR%%/ontologies/40-mlo.ontology
-%%DATADIR%%/ontologies/41-mfo.description
-%%DATADIR%%/ontologies/41-mfo.ontology
-%%DATADIR%%/ontologies/89-mtp.description
-%%DATADIR%%/ontologies/89-mtp.ontology
-%%DATADIR%%/ontologies/90-tracker.description
-%%DATADIR%%/ontologies/90-tracker.ontology
-%%DATADIR%%/ontologies/92-slo.description
-%%DATADIR%%/ontologies/92-slo.ontology
-%%DATADIR%%/ontologies/93-libosinfo.description
-%%DATADIR%%/ontologies/93-libosinfo.ontology
+%%DATADIR%%/domain-ontologies/default.rule
+%%DATADIR%%/ontologies/nepomuk/30-nie.description
+%%DATADIR%%/ontologies/nepomuk/30-nie.ontology
+%%DATADIR%%/ontologies/nepomuk/32-nco.description
+%%DATADIR%%/ontologies/nepomuk/32-nco.ontology
+%%DATADIR%%/ontologies/nepomuk/33-nfo.description
+%%DATADIR%%/ontologies/nepomuk/33-nfo.ontology
+%%DATADIR%%/ontologies/nepomuk/34-nmo.description
+%%DATADIR%%/ontologies/nepomuk/34-nmo.ontology
+%%DATADIR%%/ontologies/nepomuk/35-ncal.description
+%%DATADIR%%/ontologies/nepomuk/35-ncal.ontology
+%%DATADIR%%/ontologies/nepomuk/36-scal.description
+%%DATADIR%%/ontologies/nepomuk/36-scal.ontology
+%%DATADIR%%/ontologies/nepomuk/37-nid3.description
+%%DATADIR%%/ontologies/nepomuk/37-nid3.ontology
+%%DATADIR%%/ontologies/nepomuk/38-nmm.description
+%%DATADIR%%/ontologies/nepomuk/38-nmm.ontology
+%%DATADIR%%/ontologies/nepomuk/39-mto.description
+%%DATADIR%%/ontologies/nepomuk/39-mto.ontology
+%%DATADIR%%/ontologies/nepomuk/40-mlo.description
+%%DATADIR%%/ontologies/nepomuk/40-mlo.ontology
+%%DATADIR%%/ontologies/nepomuk/41-mfo.description
+%%DATADIR%%/ontologies/nepomuk/41-mfo.ontology
+%%DATADIR%%/ontologies/nepomuk/89-mtp.description
+%%DATADIR%%/ontologies/nepomuk/89-mtp.ontology
+%%DATADIR%%/ontologies/nepomuk/90-tracker.description
+%%DATADIR%%/ontologies/nepomuk/90-tracker.ontology
+%%DATADIR%%/ontologies/nepomuk/91-maemo.description
+%%DATADIR%%/ontologies/nepomuk/91-maemo.ontology
+%%DATADIR%%/ontologies/nepomuk/92-slo.description
+%%DATADIR%%/ontologies/nepomuk/92-slo.ontology
+%%DATADIR%%/ontologies/nepomuk/93-libosinfo.description
+%%DATADIR%%/ontologies/nepomuk/93-libosinfo.ontology
 %%DATADIR%%/stop-words/stopwords.da
 %%DATADIR%%/stop-words/stopwords.de
 %%DATADIR%%/stop-words/stopwords.en
@@ -386,71 +277,14 @@ share/locale/zh_TW/LC_MESSAGES/tracker.mo
 %%DATADIR%%/stop-words/stopwords.pt
 %%DATADIR%%/stop-words/stopwords.ru
 %%DATADIR%%/stop-words/stopwords.sv
-%%DATADIR%%-tests/01-writeback.py
-share/vala/vapi/tracker-control-%%TRACKER_VER%%.deps
-share/vala/vapi/tracker-control-%%TRACKER_VER%%.vapi
-share/vala/vapi/tracker-miner-%%TRACKER_VER%%.deps
-share/vala/vapi/tracker-miner-%%TRACKER_VER%%.vapi
-share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.deps
-share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.vapi
-%%WEB_MINERS%%share/xul-ext/trackerbird/README
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome.manifest
-%%WEB_MINERS%%share/xul-ext/trackerbird/install.rdf
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/about.xul
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/bindings.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/email-address-parser.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/mailstore.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/namespace.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/options.xul
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/persistent-store.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/plugin.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/queue.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/tb-overlay.xul
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/trackerstore.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/ui.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/skin/overlay.css
-%%WEB_MINERS%%share/xul-ext/trackerbird/defaults/preferences/prefs.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/COPYRIGHT
-%%WEB_MINERS%%share/xul-ext/trackerfox/README
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome.manifest
-%%WEB_MINERS%%share/xul-ext/trackerfox/install.rdf
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/about.xul
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/bindings.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/bookmarks.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/ff-overlay.xul
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/namespace.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/plugin.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/skin/overlay.css
-%%WEB_MINERS%%share/xul-ext/trackerfox/defaults/preferences/prefs.js
+%%DATADIR%%/tracker-backup.xml
+%%DATADIR%%/tracker-miner.xml
+%%DATADIR%%/tracker-resources.xml
+%%DATADIR%%/tracker-statistics.xml
+%%DATADIR%%/tracker-status.xml
+share/vala/vapi/tracker-control-2.0.deps
+share/vala/vapi/tracker-control-2.0.vapi
+share/vala/vapi/tracker-miner-2.0.deps
+share/vala/vapi/tracker-miner-2.0.vapi
+share/vala/vapi/tracker-sparql-2.0.deps
+share/vala/vapi/tracker-sparql-2.0.vapi