Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 257 insertions, 244 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index b25795746..684adcc50 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,8 +3,8 @@
 #    $MCom$
 
 PORTNAME=	tracker
-PORTVERSION=	0.14.4
-PORTREVISION=	1
+PORTVERSION=	1.0.0
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
@@ -12,53 +12,35 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Object database, tag/metadata database, search tool and indexer
 
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libwv-1.2.so:${PORTSDIR}/textproc/wv \
 		libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libexempi.so:${PORTSDIR}/textproc/exempi \
 		libhal.so:${PORTSDIR}/sysutils/hal \
-		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
 		libraptor.so:${PORTSDIR}/textproc/raptor \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libiptcdata.so:${PORTSDIR}/graphics/libiptcdata \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		librest-0.7.so:${PORTSDIR}/devel/librest \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libcue.so:${PORTSDIR}/textproc/libcue \
-		libtag.so:${PORTSDIR}/audio/taglib
+		libmediaart-1.0.so:${PORTSDIR}/multimedia/libmediaart \
+		librest-0.7.so:${PORTSDIR}/devel/librest
 RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
 		o3totxt:${PORTSDIR}/converters/o3read \
 		pdftotext:${PORTSDIR}/graphics/poppler-utils \
 		w3m:${PORTSDIR}/www/w3m
 
-PLIST_SUB=	TRACKER_VER="0.14"
-
-TRACKER_VER=	0.14
+PLIST_SUB=	TRACKER_VER="1.0"
 
-USES=		gettext gmake pathfix pkgconfig
-USE_SQLITE=	3
-USE_XZ=		yes
-USE_GNOME=	gnomeprefix gtk30 intltool ltverhack
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intltool introspection:build
 USE_LDCONFIG=	yes
-USE_GSTREAMER=	core
+USE_SQLITE=	3
+USE_GSTREAMER1=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker
 CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
-		--enable-libexif --enable-libvorbis \
-		--enable-libiptcdata --enable-miner-fs \
+		--disable-libiptcdata --enable-miner-fs \
 		--disable-meegotouch  --disable-miner-flickr \
-	 	--enable-taglib \
-		--enable-tracker-preferences --enable-poppler \
-		--enable-libgsf \
-		--disable-libosinfo --enable-libgif \
-		--enable-libjpeg --enable-libtiff \
-		--enable-libvorbis --enable-libflac \
-		--enable-libcue
+		--enable-tracker-preferences \
+		--disable-libosinfo \
+		--enable-generic-media-extractor=gstreamer
 GLIB_SCHEMAS=	org.freedesktop.Tracker.DB.gschema.xml \
 		org.freedesktop.Tracker.Extract.gschema.xml \
 		org.freedesktop.Tracker.FTS.gschema.xml \
@@ -68,47 +50,88 @@ GLIB_SCHEMAS=	org.freedesktop.Tracker.DB.gschema.xml \
 		org.freedesktop.Tracker.enums.xml \
 		org.freedesktop.Tracker.gschema.xml
 
-#  --enable-miner-evolution
-#  --enable-miner-thunderbird
-#  --enable-miner-firefox  enable Firefox email data miner [[default=auto]]
-#  --enable-nautilus-extension
-#		--enable-tracker-search-bar
-#  --enable-qt             enable Qt support, (MP3 album art) [[default=auto]]
-#  --enable-tracker-search-bar
-#                          enable tracker-search-bar[[default=auto]]
-#  --enable-tracker-needle enable tracker-needle [[default=auto]]
-#                          enable the tracker preferences dialog
-#                          [[default=auto]]
-#  --enable-tracker-explorer
-#                          enable tracker-explorer[[default=auto]]
-#  --enable-libstreamanalyzer
-#                          enable libstreamananalyzer [[default=no]]
-#  --disable-libxml2       disable HTML/XML extractors [[default=yes]]
-#  --enable-gdkpixbuf      enable GdkPixbuf support, (MP3 album art)
-#                          [[default=auto]]
-#  --enable-generic-media-extractor=ARG
-#                          enables one of the (gstreamer, xine, external, auto)
-#                          generic media extractor backends [[default=auto]]
-#  --disable-unzip-ps-gz-files
-#                          disable unzipping ps.gz files [[default=yes]]
-#
-#
-#  --enable-playlist       enable playlist support [[default=auto]]
-#  --enable-guarantee-metadata
-#                          enable guaranteed existence of some metadata
-#                          [[default=no]]
-#
-#
+OPTIONS_DEFINE=		AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS WEB_MINERS
+OPTIONS_DEFAULT=	AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINER
+WEB_MINERS_DESC=	Support for Firefox, Thunderbird and Evolution
+AUDIO_MINERS_DESC=	Support for audio files
+DOCUMENT_MINERS_DESC=	Support for some sort of documents (pdf, ps, xps, office)
+GRAPHIC_MINERS_DESC=	Support for some graphic formats (gif, png, tiff)
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
+.if ${PORT_OPTIONS:MWEB_MINERS}
+CONFIGURE_ARGS+=	--enable-miner-evolution --enable-miner-firefox \
+			--enable-miner-thunderbird
+PLIST_SUB+=	WEB_MINERS=""
+.else
+CONFIGURE_ARGS+=	--disable-miner-evolution --disable-miner-firefox \
+			--disable-miner-thunderbird
+PLIST_SUB+=	WEB_MINERS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MAUDIO_MINERS}
+LIB_DEPENDS+=	libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libcue.so:${PORTSDIR}/textproc/libcue \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libtag.so:${PORTSDIR}/audio/taglib
+CONFIGURE_ARGS+=	--enable-libvorbis --enable-libflac \
+			--enable-taglib --enable-mp3 \
+			--enable-libcue --enable-playlist
+PLIST_SUB+=	AUDIO_MINERS=""
+.else
+CONFIGURE_ARGS+=	--disable-libvorbis --disable-libflac \
+			--disable-taglib --disable-mp3 \
+			--disable-libcue --disable-playlist
+PLIST_SUB+=	AUDIO_MINERS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDOCUMENT_MINERS}
+LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
+		libgxps.so:${PORTSDIR}/graphics/libgxps \
+		libgsf-1.so:${PORTSDIR}/devel/libgsf \
+		libexempi.so:${PORTSDIR}/textproc/exempi \
+		libwv-1.2.so:${PORTSDIR}/textproc/wv
+CONFIGURE_ARGS+=	--enable-libgxps --enable-poppler \
+			--enable-libxml2 --enable-exif \
+			--enable-libgsf --enable-abiword \
+			--enable-dvi --enable-ps \
+			--enable-exempi --enable-text
+PLIST_SUB+=	DOCUMENT_MINERS=""
+.else
+CONFIGURE_ARGS+=	--disable-libgxps --disable-poppler \
+			--disable-libxml2 --disable-exif \
+			--disable-libgsf --disable-abiword \
+			--disable-dvi --disable-ps \
+			--disable-exempi --disable-text
+PLIST_SUB+=	DOCUMENT_MINERS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MGRAPHIC_MINERS}
+LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
+CONFIGURE_ARGS+=	--enable-libgif \
+			--enable-libjpeg \
+			--enable-libtiff \
+			--enable-icon \
+			--enable-libpng15
+PLIST_SUB+=	GRAPHIC_MINERS=""
+.else
+CONFIGURE_ARGS+=	--disable-libgif \
+			--disable-libjpeg \
+			--disable-libtiff \
+			--disable-icon \
+			--disable-libpng15
+PLIST_SUB+=	GRAPHIC_MINERS="@comment "
+.endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtracker-*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtracker-*.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tracker-0.14/*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tracker-0.14/*/*.so*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tracker-1.0/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tracker-1.0/*/*.so*
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index 835b0ec2a..1416f461a 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tracker-0.14.4.tar.xz) = b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918
-SIZE (tracker-0.14.4.tar.xz) = 5946796
+SHA256 (tracker-1.0.0.tar.xz) = a1d033faf2c78f0e239f3c2c961b96623c9a7dabd938c08e3f5660bd70f54ba2
+SIZE (tracker-1.0.0.tar.xz) = 6172700
diff --git a/sysutils/tracker/files/patch-configure b/sysutils/tracker/files/patch-configure
index 4a2ce7c98..1c7db9aa2 100644
--- a/sysutils/tracker/files/patch-configure
+++ b/sysutils/tracker/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-04-15 09:16:49.494751210 +0000
-+++ configure	2013-04-15 09:16:52.902751762 +0000
-@@ -24090,14 +24090,14 @@
+--- configure.orig	2014-03-23 12:15:46.322707111 +0000
++++ configure	2014-03-23 12:19:39.849690806 +0000
+@@ -23983,14 +23983,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
@@ -15,10 +15,10 @@
    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
-@@ -24110,14 +24110,16 @@
+ fi
+@@ -24002,14 +24002,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
@@ -27,7 +27,7 @@
    ($PKG_CONFIG --exists --print-errors "dbus-1      >= $DBUS_REQUIRED
 -                      hal         >= $HAL_REQUIRED") 2>&5
 +                      hal         >= $HAL_REQUIRED
-+		      dbus-glib") 2>&5
++		      dbus-glib-1") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
@@ -35,21 +35,21 @@
 -                      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
-@@ -24139,10 +24141,12 @@
+ fi
+@@ -24030,10 +24032,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_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "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_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1      >= $DBUS_REQUIRED
 -                      hal         >= $HAL_REQUIRED" 2>&1`
 +                      hal         >= $HAL_REQUIRED
-+                      dbus-glib" 2>&1`
++                      dbus-glib-1" 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$HAL_PKG_ERRORS" >&5
diff --git a/sysutils/tracker/files/patch-tests_libtracker-common_tracker-sched-test.c b/sysutils/tracker/files/patch-tests_libtracker-common_tracker-sched-test.c
deleted file mode 100644
index 9dceb34a8..000000000
--- a/sysutils/tracker/files/patch-tests_libtracker-common_tracker-sched-test.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/libtracker-common/tracker-sched-test.c.orig	2013-04-15 09:28:57.374700281 +0000
-+++ tests/libtracker-common/tracker-sched-test.c	2013-04-15 09:29:05.740091901 +0000
-@@ -46,7 +46,7 @@
- {
-         g_assert (scheduler_is (SCHED_OTHER));
-         g_assert (tracker_sched_idle ());
--        g_assert (scheduler_is (SCHED_IDLE));
-+        g_assert (scheduler_is (SCHED_OTHER));
- }
- 
- 
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 22d4fdf05..7056e1925 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -7,102 +7,100 @@ bin/tracker-search
 bin/tracker-sparql
 bin/tracker-stats
 bin/tracker-tag
+etc/xdg/autostart/tracker-extract.desktop
 etc/xdg/autostart/tracker-miner-fs.desktop
 etc/xdg/autostart/tracker-store.desktop
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-data.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-encoding.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-exif.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-extract-client.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-extract-info.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-extract.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-guarantee.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-iptc.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-module-manager.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-utils.h
-include/tracker-%%TRACKER_VER%%/libtracker-extract/tracker-xmp.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-crawler.h
+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-decorator-fs.h
+include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-decorator.h
 include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-indexing-tree.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-media-art.h
 include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-common.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-manager.h
 include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-object.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-web.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-miner/tracker-network-provider.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-password-provider.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-storage.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-thumbnailer.h
 include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-generated.h
 include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-sparql.h
 include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-version.h
-lib/girepository-1.0/Tracker-%%TRACKER_VER%%.typelib
-lib/girepository-1.0/TrackerExtract-%%TRACKER_VER%%.typelib
-lib/girepository-1.0/TrackerMiner-%%TRACKER_VER%%.typelib
-lib/libtracker-extract-%%TRACKER_VER%%.la
-lib/libtracker-extract-%%TRACKER_VER%%.so
-lib/libtracker-extract-%%TRACKER_VER%%.so.0
+lib/libtracker-control-%%TRACKER_VER%%.la
+lib/libtracker-control-%%TRACKER_VER%%.so
+lib/libtracker-control-%%TRACKER_VER%%.so.0
+lib/libtracker-control-%%TRACKER_VER%%.so.0.0.0
 lib/libtracker-miner-%%TRACKER_VER%%.la
 lib/libtracker-miner-%%TRACKER_VER%%.so
 lib/libtracker-miner-%%TRACKER_VER%%.so.0
+lib/libtracker-miner-%%TRACKER_VER%%.so.0.0.0
 lib/libtracker-sparql-%%TRACKER_VER%%.la
 lib/libtracker-sparql-%%TRACKER_VER%%.so
 lib/libtracker-sparql-%%TRACKER_VER%%.so.0
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.la
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.so
+lib/libtracker-sparql-%%TRACKER_VER%%.so.0.0.0
+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/tracker-%%TRACKER_VER%%/libtracker-common.la
 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.la
 lib/tracker-%%TRACKER_VER%%/libtracker-data.so
 lib/tracker-%%TRACKER_VER%%/libtracker-data.so.0
-lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.la
-lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.so
-lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.la
-lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.so
-libdata/pkgconfig/tracker-extract-%%TRACKER_VER%%.pc
+lib/tracker-%%TRACKER_VER%%/libtracker-data.so.0.0.0
+lib/tracker-%%TRACKER_VER%%/libtracker-extract.la
+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
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.so
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.la
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.so
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.la
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.so
+lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.la
+lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.so
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.la
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.so
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.la
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.so
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.la
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.so
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.la
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.so
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.la
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.so
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.la
+%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.so
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.la
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.so
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.la
+%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xps.la
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xps.so
+%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.la
+%%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
@@ -112,82 +110,78 @@ libexec/tracker-writeback
 man/man1/tracker-control.1.gz
 man/man1/tracker-extract.1.gz
 man/man1/tracker-import.1.gz
-man/man1/tracker-stats.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-search.1.gz
 man/man1/tracker-sparql.1.gz
+man/man1/tracker-stats.1.gz
 man/man1/tracker-store.1.gz
 man/man1/tracker-tag.1.gz
 man/man1/tracker-writeback.1.gz
 share/applications/tracker-needle.desktop
 share/applications/tracker-preferences.desktop
-share/dbus-1/services/org.freedesktop.Tracker1.Extract.service
 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.Writeback.service
 share/dbus-1/services/org.freedesktop.Tracker1.service
-share/doc/libtracker-extract/annotation-glossary.html
-share/doc/libtracker-extract/ch02.html
-share/doc/libtracker-extract/ch03.html
-share/doc/libtracker-extract/home.png
-share/doc/libtracker-extract/index.html
-share/doc/libtracker-extract/index.sgml
-share/doc/libtracker-extract/left.png
-share/doc/libtracker-extract/libtracker-extract-Data-utilities.html
-share/doc/libtracker-extract/libtracker-extract-Exif.html
-share/doc/libtracker-extract/libtracker-extract-How-to-use-libtracker-extract.html
-share/doc/libtracker-extract/libtracker-extract-IPTC.html
-share/doc/libtracker-extract/libtracker-extract-TrackerExtractInfo.html
-share/doc/libtracker-extract/libtracker-extract-XMP.html
-share/doc/libtracker-extract/libtracker-extract-reference.html
-share/doc/libtracker-extract/libtracker-extract.devhelp2
-share/doc/libtracker-extract/right.png
-share/doc/libtracker-extract/style.css
-share/doc/libtracker-extract/tracker-overview-compiling.html
-share/doc/libtracker-extract/tracker-overview.html
-share/doc/libtracker-extract/up.png
+share/doc/libtracker-control/TrackerMinerManager.html
+share/doc/libtracker-control/annotation-glossary.html
+share/doc/libtracker-control/ch01.html
+share/doc/libtracker-control/home.png
+share/doc/libtracker-control/index.html
+share/doc/libtracker-control/index.sgml
+share/doc/libtracker-control/left-insensitive.png
+share/doc/libtracker-control/left.png
+share/doc/libtracker-control/libtracker-control.devhelp2
+share/doc/libtracker-control/libtracker-miner-reference.html
+share/doc/libtracker-control/right-insensitive.png
+share/doc/libtracker-control/right.png
+share/doc/libtracker-control/style.css
+share/doc/libtracker-control/up-insensitive.png
+share/doc/libtracker-control/up.png
+share/doc/libtracker-miner/TrackerDecorator.html
+share/doc/libtracker-miner/TrackerDecoratorFS.html
 share/doc/libtracker-miner/TrackerIndexingTree.html
 share/doc/libtracker-miner/TrackerMiner.html
 share/doc/libtracker-miner/TrackerMinerFS.html
-share/doc/libtracker-miner/TrackerMinerManager.html
+share/doc/libtracker-miner/TrackerMinerOnline.html
 share/doc/libtracker-miner/annotation-glossary.html
 share/doc/libtracker-miner/ch02.html
 share/doc/libtracker-miner/ch03.html
 share/doc/libtracker-miner/ch04.html
-share/doc/libtracker-miner/ch05.html
-share/doc/libtracker-miner/ch06.html
 share/doc/libtracker-miner/home.png
 share/doc/libtracker-miner/index.html
 share/doc/libtracker-miner/index.sgml
+share/doc/libtracker-miner/left-insensitive.png
 share/doc/libtracker-miner/left.png
 share/doc/libtracker-miner/libtracker-miner-Enumerations.html
-share/doc/libtracker-miner/libtracker-miner-Media-art-management.html
-share/doc/libtracker-miner/libtracker-miner-Thumbnailer-management.html
-share/doc/libtracker-miner/libtracker-miner-TrackerMinerWeb.html
-share/doc/libtracker-miner/libtracker-miner-TrackerNetworkProvider.html
-share/doc/libtracker-miner/libtracker-miner-TrackerPasswordProvider.html
-share/doc/libtracker-miner/libtracker-miner-TrackerStorage.html
+share/doc/libtracker-miner/libtracker-miner-TrackerThumbnailer.html
 share/doc/libtracker-miner/libtracker-miner-reference.html
 share/doc/libtracker-miner/libtracker-miner.devhelp2
+share/doc/libtracker-miner/right-insensitive.png
 share/doc/libtracker-miner/right.png
 share/doc/libtracker-miner/style.css
 share/doc/libtracker-miner/tracker-overview-compiling.html
 share/doc/libtracker-miner/tracker-overview.html
+share/doc/libtracker-miner/up-insensitive.png
 share/doc/libtracker-miner/up.png
 share/doc/libtracker-sparql/TrackerSparqlBuilder.html
 share/doc/libtracker-sparql/TrackerSparqlConnection.html
 share/doc/libtracker-sparql/TrackerSparqlCursor.html
+share/doc/libtracker-sparql/annotation-glossary.html
 share/doc/libtracker-sparql/home.png
 share/doc/libtracker-sparql/index.html
 share/doc/libtracker-sparql/index.sgml
+share/doc/libtracker-sparql/left-insensitive.png
 share/doc/libtracker-sparql/left.png
 share/doc/libtracker-sparql/libtracker-sparql-Utilities.html
 share/doc/libtracker-sparql/libtracker-sparql-Version-Information.html
 share/doc/libtracker-sparql/libtracker-sparql-reference.html
 share/doc/libtracker-sparql/libtracker-sparql.devhelp2
+share/doc/libtracker-sparql/right-insensitive.png
 share/doc/libtracker-sparql/right.png
 share/doc/libtracker-sparql/style.css
 share/doc/libtracker-sparql/tracker-examples-builder.html
@@ -199,10 +193,11 @@ share/doc/libtracker-sparql/tracker-overview-compiling.html
 share/doc/libtracker-sparql/tracker-overview-connection-methods.html
 share/doc/libtracker-sparql/tracker-overview-environment-variables.html
 share/doc/libtracker-sparql/tracker-overview.html
+share/doc/libtracker-sparql/up-insensitive.png
 share/doc/libtracker-sparql/up.png
-share/gir-1.0/Tracker-%%TRACKER_VER%%.gir
-share/gir-1.0/TrackerExtract-%%TRACKER_VER%%.gir
-share/gir-1.0/TrackerMiner-%%TRACKER_VER%%.gir
+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/icons/hicolor/16x16/apps/tracker.png
 share/icons/hicolor/22x22/apps/tracker.png
 share/icons/hicolor/24x24/apps/tracker.png
@@ -210,7 +205,6 @@ 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/ca@valencia/LC_MESSAGES/tracker.mo
@@ -233,7 +227,9 @@ 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/lv/LC_MESSAGES/tracker.mo
 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/nl/LC_MESSAGES/tracker.mo
@@ -250,32 +246,49 @@ share/locale/sr/LC_MESSAGES/tracker.mo
 share/locale/sr@latin/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
 share/locale/te/LC_MESSAGES/tracker.mo
+share/locale/tg/LC_MESSAGES/tracker.mo
 share/locale/th/LC_MESSAGES/tracker.mo
+share/locale/uk/LC_MESSAGES/tracker.mo
 share/locale/zh_CN/LC_MESSAGES/tracker.mo
-%%DATADIR%%-tests/01-writeback.py
-%%DATADIR%%/extract-rules/10-abw.rule
-%%DATADIR%%/extract-rules/10-dvi.rule
-%%DATADIR%%/extract-rules/10-epub.rule
-%%DATADIR%%/extract-rules/10-flac.rule
-%%DATADIR%%/extract-rules/10-gif.rule
-%%DATADIR%%/extract-rules/10-html.rule
-%%DATADIR%%/extract-rules/10-ico.rule
-%%DATADIR%%/extract-rules/10-jpeg.rule
-%%DATADIR%%/extract-rules/10-mp3.rule
-%%DATADIR%%/extract-rules/10-msoffice.rule
-%%DATADIR%%/extract-rules/10-oasis.rule
-%%DATADIR%%/extract-rules/10-pdf.rule
-%%DATADIR%%/extract-rules/10-png.rule
-%%DATADIR%%/extract-rules/10-ps.rule
+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-web.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
+%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-dvi.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
-%%DATADIR%%/extract-rules/10-tiff.rule
-%%DATADIR%%/extract-rules/10-vorbis.rule
-%%DATADIR%%/extract-rules/10-xmp.rule
-%%DATADIR%%/extract-rules/11-msoffice-xml.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
-%%DATADIR%%/extract-rules/15-playlist.rule
-%%DATADIR%%/extract-rules/90-gstreamer-generic.rule
-%%DATADIR%%/extract-rules/90-text-generic.rule
+%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/15-playlist.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%%/languages/stopwords.da
 %%DATADIR%%/languages/stopwords.de
 %%DATADIR%%/languages/stopwords.en
@@ -290,6 +303,7 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
 %%DATADIR%%/languages/stopwords.ru
 %%DATADIR%%/languages/stopwords.sv
 %%DATADIR%%/miners/tracker-miner-applications.desktop
+%%DATADIR%%/miners/tracker-miner-extract.desktop
 %%DATADIR%%/miners/tracker-miner-files.desktop
 %%DATADIR%%/ontologies/10-xsd.description
 %%DATADIR%%/ontologies/10-xsd.ontology
@@ -331,40 +345,27 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
 %%DATADIR%%/ontologies/92-slo.ontology
 %%DATADIR%%/ontologies/93-libosinfo.description
 %%DATADIR%%/ontologies/93-libosinfo.ontology
-%%DATADIR%%/tracker-backup.xml
-%%DATADIR%%/tracker-extract.xml
-%%DATADIR%%/tracker-needle.ui
-%%DATADIR%%/tracker-miner-web.xml
-%%DATADIR%%/tracker-miner.xml
-%%DATADIR%%/tracker-preferences.ui
-%%DATADIR%%/tracker-resources.xml
-%%DATADIR%%/tracker-statistics.xml
-%%DATADIR%%/tracker-status.xml
-%%DATADIR%%/tracker-writeback.xml
+%%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
-@dirrm %%DATADIR%%/ontologies
-@dirrm %%DATADIR%%/miners
-@dirrm %%DATADIR%%/languages
-@dirrmtry %%DATADIR%%/icons
-@dirrm %%DATADIR%%/extract-rules
-@dirrm %%DATADIR%%-tests
-@dirrm %%DATADIR%%
-@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-sparql
 @dirrm share/doc/libtracker-miner
-@dirrm share/doc/libtracker-extract
+@dirrm share/doc/libtracker-control
 @dirrm lib/tracker-%%TRACKER_VER%%/writeback-modules
 @dirrm lib/tracker-%%TRACKER_VER%%/extract-modules
 @dirrm lib/tracker-%%TRACKER_VER%%
 @dirrm include/tracker-%%TRACKER_VER%%/libtracker-sparql
 @dirrm include/tracker-%%TRACKER_VER%%/libtracker-miner
-@dirrm include/tracker-%%TRACKER_VER%%/libtracker-extract
+@dirrm include/tracker-%%TRACKER_VER%%/libtracker-control
 @dirrm include/tracker-%%TRACKER_VER%%
+@dirrm %%DATADIR%%/ontologies
+@dirrm %%DATADIR%%/miners
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/extract-rules
+@dirrm %%DATADIR%%-tests
+@dirrm %%DATADIR%%