data: Merge all miner .desktop files into existing DBus .service files

So .service files store just the 'Name' and 'Exec' information for the DBus name
and binary to instantiate. Now we keep the 'Path', '_DisplayName' and
'Comment' in here too. These all come from the data/miners/*.desktop files
which no longer exist and are mainly used for tracker-control to know about
miners that are not running and that exist or have been installed.

The old '_Description' is now '_Comment'.
The old '_Name' is now '_DisplayName'
The old 'DBusPath' is now 'Path'.

As usual all '_' prefixed keys are translated so tracker-control still shows
translated miners in its output.

34 files changed, 154 insertions, 149 deletions

diff --git a/Makefile.am b/Makefile.am
index 1498e6b84..5791a0811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = data src docs po utils examples
+SUBDIRS = src docs po utils examples
 
 if HAVE_UNIT_TESTS
 SUBDIRS += tests
diff --git a/configure.ac b/configure.ac
index 20c8dc30b..4842875cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2556,8 +2556,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
 ##################################################################
 
 AC_CONFIG_FILES([
-	data/Makefile
-	data/miners/Makefile
 	docs/Makefile
 	docs/design/Makefile
 	docs/manpages/Makefile
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 6341442d1..000000000
--- a/data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pc
-*.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index c22d56d29..000000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = miners
diff --git a/data/miners/.gitignore b/data/miners/.gitignore
deleted file mode 100644
index 7c8890b31..000000000
--- a/data/miners/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.desktop.in
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
deleted file mode 100644
index 18835fb27..000000000
--- a/data/miners/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-desktop_in_in_files =                                  \
-	tracker-miner-extract.desktop.in.in            \
-	tracker-miner-userguides.desktop.in.in         \
-	tracker-miner-applications.desktop.in.in       \
-	tracker-miner-evolution.desktop.in.in          \
-	tracker-miner-files.desktop.in.in              \
-	tracker-miner-rss.desktop.in.in
-
-desktop_in_files =                                     \
-	tracker-miner-extract.desktop.in               \
-	tracker-miner-userguides.desktop.in            \
-	tracker-miner-applications.desktop.in          \
-	tracker-miner-evolution.desktop.in             \
-	tracker-miner-files.desktop.in                 \
-	tracker-miner-rss.desktop.in
-
-tracker_minersdir = $(datadir)/tracker/miners
-
-tracker_miners_DATA =
-
-if HAVE_TRACKER_MINER_FS
-tracker_miners_DATA +=                                 \
-	tracker-miner-extract.desktop                  \
-	tracker-miner-files.desktop
-endif
-
-if HAVE_TRACKER_MINER_APPS
-tracker_miners_DATA += tracker-miner-applications.desktop
-endif
-
-if HAVE_TRACKER_MINER_USER_GUIDES
-tracker_miners_DATA += tracker-miner-userguides.desktop
-endif
-
-if HAVE_TRACKER_MINER_EVOLUTION
-tracker_miners_DATA += tracker-miner-evolution.desktop
-endif
-
-if HAVE_TRACKER_MINER_RSS
-tracker_miners_DATA += tracker-miner-rss.desktop
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-%.desktop.in: %.desktop.in.in
-	@sed -e "s|@datadir[@]|$(datadir)|" $< > $@
-
-EXTRA_DIST = $(desktop_in_in_files)
-CLEANFILES =                                           \
-	$(tracker_miners_DATA)                         \
-	$(desktop_in_files)
diff --git a/data/miners/tracker-miner-applications.desktop.in.in b/data/miners/tracker-miner-applications.desktop.in.in
deleted file mode 100644
index 7956ff43d..000000000
--- a/data/miners/tracker-miner-applications.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Applications
-_Comment=Applications data miner
-Icon=system-installer
-DBusName=org.freedesktop.Tracker1.Miner.Applications
-DBusPath=/org/freedesktop/Tracker1/Miner/Applications
diff --git a/data/miners/tracker-miner-evolution.desktop.in.in b/data/miners/tracker-miner-evolution.desktop.in.in
deleted file mode 100644
index f860c5b35..000000000
--- a/data/miners/tracker-miner-evolution.desktop.in.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-_Name=Emails
-_Comment=Evolution Email miner
-DBusName=org.freedesktop.Tracker1.Miner.Emails
-DBusPath=/org/freedesktop/Tracker1/Miner/Emails
diff --git a/data/miners/tracker-miner-extract.desktop.in.in b/data/miners/tracker-miner-extract.desktop.in.in
deleted file mode 100644
index 1cf630284..000000000
--- a/data/miners/tracker-miner-extract.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Extractor
-_Comment=Metadata extractor
-Icon=folder
-DBusName=org.freedesktop.Tracker1.Miner.Extract
-DBusPath=/org/freedesktop/Tracker1/Miner/Extract
diff --git a/data/miners/tracker-miner-files.desktop.in.in b/data/miners/tracker-miner-files.desktop.in.in
deleted file mode 100644
index bde06c20f..000000000
--- a/data/miners/tracker-miner-files.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=File System
-_Comment=File system data miner
-Icon=folder
-DBusName=org.freedesktop.Tracker1.Miner.Files
-DBusPath=/org/freedesktop/Tracker1/Miner/Files
diff --git a/data/miners/tracker-miner-rss.desktop.in.in b/data/miners/tracker-miner-rss.desktop.in.in
deleted file mode 100644
index 5147a7eea..000000000
--- a/data/miners/tracker-miner-rss.desktop.in.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-_Name=RSS/ATOM Feeds
-_Comment=Fetch RSS/ATOM Feeds
-DBusName=org.freedesktop.Tracker1.Miner.RSS
-DBusPath=/org/freedesktop/Tracker1/Miner/RSS
diff --git a/data/miners/tracker-miner-userguides.desktop.in.in b/data/miners/tracker-miner-userguides.desktop.in.in
deleted file mode 100644
index 16634bd60..000000000
--- a/data/miners/tracker-miner-userguides.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Userguides
-_Comment=Userguide data miner
-Icon=system-installer
-DBusName=org.freedesktop.Tracker1.Miner.Userguides
-DBusPath=/org/freedesktop/Tracker1/Miner/Userguides
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e48b84fe7..63fc71fe5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,6 +22,7 @@ src/miners/apps/tracker-miner-apps.desktop.in.in
 src/miners/fs/tracker-main.c
 src/miners/fs/tracker-miner-files.c
 src/miners/fs/tracker-miner-fs.desktop.in.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
 src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
 src/miners/rss/tracker-main.c
 src/miners/rss/tracker-miner-rss.c
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
index 0a7c4ea88..cf05bb613 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -40,10 +40,10 @@
 
 #define TRACKER_MINER_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_MINER_MANAGER, TrackerMinerManagerPrivate))
 
-#define DESKTOP_ENTRY_GROUP "Desktop Entry"
-#define DBUS_NAME_KEY "DBusName"
-#define DBUS_PATH_KEY "DBusPath"
-#define DISPLAY_NAME_KEY "Name"
+#define DESKTOP_ENTRY_GROUP "D-BUS Service"
+#define DBUS_NAME_KEY "Name"
+#define DBUS_PATH_KEY "Path"
+#define DISPLAY_NAME_KEY "DisplayName"
 #define DESCRIPTION_KEY "Comment"
 
 typedef struct TrackerMinerManagerPrivate TrackerMinerManagerPrivate;
@@ -759,9 +759,9 @@ check_file (GFile    *file,
 
 	data = g_slice_new0 (MinerData);
 	data->dbus_path = dbus_path;
-	data->dbus_name = dbus_name;
+	data->dbus_name = dbus_name;        /* In .service file as Name */
 	data->display_name = display_name;
-	data->description = description;
+	data->description = description;    /* In .desktop file as _comment */
 
 	priv->miners = g_list_prepend (priv->miners, data);
 
@@ -829,7 +829,7 @@ initialize_miners_data (TrackerMinerManager *manager)
 	}
 
 	file = g_file_new_for_path (miners_dir);
-	directory_foreach (file, ".desktop", (GFunc) check_file, manager);
+	directory_foreach (file, ".service", (GFunc) check_file, manager);
 	g_object_unref (file);
 }
 
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index f1b28d16b..e25b76691 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -85,7 +85,7 @@ gsettings_SCHEMAS = org.freedesktop.Tracker.DB.gschema.xml
 @GSETTINGS_RULES@
 
 # Dist / Clean rules for all data
-BUILT_SOURCES = \
+CLEANFILES = \
 	libtracker_data_la_vala.stamp \
 	$(gsettings_SCHEMAS)
 
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 74a358726..d31dd57cf 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -22,14 +22,22 @@ tracker_miner_apps_LDADD =                             \
 	$(TRACKER_MINER_APPS_LIBS)
 
 # DBus interfaces (XML files) and services
-service_in_files = org.freedesktop.Tracker1.Miner.Applications.service.in
-
-%.service: %.service.in
+%.service.in: %.service.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Applications.service
 
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(LN_S) -f $(servicedir)/$(service_DATA)
+uninstall-local:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(RM) $(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)
+
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -44,8 +52,9 @@ autostart_DATA = tracker-miner-apps.desktop
 CLEANFILES = \
 	$(autostart_DATA) \
 	$(autostart_DATA:.desktop=.desktop.in) \
-	$(service_DATA)
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
 
 EXTRA_DIST = \
 	$(autostart_DATA:.desktop=.desktop.in.in) \
-	$(service_in_files)
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
deleted file mode 100644
index ecd1fdac4..000000000
--- a/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Applications
-Exec=@libexecdir@/tracker-miner-apps
diff --git a/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
new file mode 100644
index 000000000..100fb778c
--- /dev/null
+++ b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Applications
+Exec=@libexecdir@/tracker-miner-apps
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Applications
+_DisplayName=Applications
+_Comment=Applications data miner
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 9dcfd08f9..fec5cdf4f 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -54,14 +54,22 @@ tracker_miner_fs_LDADD =                               \
 configdir = $(datadir)/tracker
 config_DATA = tracker-miner-files-index.xml
 
-service_in_files = org.freedesktop.Tracker1.Miner.Files.service.in
-
-%.service: %.service.in
+%.service.in: %.service.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Files.service
 
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(LN_S) -f $(servicedir)/$(service_DATA)
+uninstall-local:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(RM) $(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)
+
 # Desktop files: First we fix the VERSION and libexecdir
 if HAVE_LIBMEDIAART
 requires="libmediaart-1.0"
@@ -93,11 +101,12 @@ CLEANFILES = \
 	$(autostart_DATA) \
 	$(autostart_DATA:.desktop=.desktop.in) \
 	$(service_DATA) \
+	$(service_DATA:.service=.service.in) \
 	$(gsettings_SCHEMAS)
 
 EXTRA_DIST = \
 	$(autostart_DATA:.desktop=.desktop.in.in) \
 	$(config_DATA) \
-	$(service_in_files) \
+	$(service_DATA:.service=.service.in.in) \
 	$(gsettings_SCHEMAS:.xml=.xml.in)
 
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
deleted file mode 100644
index 7563d49d0..000000000
--- a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Files
-Exec=@libexecdir@/tracker-miner-fs
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
new file mode 100644
index 000000000..1a285d93f
--- /dev/null
+++ b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Files
+Exec=@libexecdir@/tracker-miner-fs
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Files
+_DisplayName=File System
+_Comment=File system data miner
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index a607c3509..7c1dbc6ac 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -22,14 +22,22 @@ tracker_miner_rss_LDADD =                              \
 	$(TRACKER_MINER_RSS_LIBS)
 
 # DBus interfaces (XML files) and services
-service_in_files = org.freedesktop.Tracker1.Miner.RSS.service.in
-
-%.service: %.service.in
+%.service.in: %.service.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.RSS.service
 
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(LN_S) -f $(servicedir)/$(service_DATA)
+uninstall-local:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(RM) $(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)
+
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -44,8 +52,9 @@ autostart_DATA = tracker-miner-rss.desktop
 CLEANFILES = \
 	$(autostart_DATA) \
 	$(autostart_DATA:.desktop=.desktop.in) \
-	$(service_DATA)
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
 
 EXTRA_DIST = \
 	$(autostart_DATA:.desktop=.desktop.in.in) \
-	$(service_in_files)
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
deleted file mode 100644
index 539e32e12..000000000
--- a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.RSS
-Exec=@libexecdir@/tracker-miner-rss
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
new file mode 100644
index 000000000..860d2c66d
--- /dev/null
+++ b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.RSS
+Exec=@libexecdir@/tracker-miner-rss
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/RSS
+_DisplayName=RSS/ATOM Feeds
+_Comment=Fetch RSS/ATOM Feeds
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 049264445..60112bce8 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -22,14 +22,22 @@ tracker_miner_user_guides_LDADD =                      \
 	$(TRACKER_MINER_USER_GUIDES_LIBS)
 
 # DBus interfaces (XML files) and services
-service_in_files = org.freedesktop.Tracker1.Miner.Userguides.service.in
-
-%.service: %.service.in
+%.service.in: %.service.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Userguides.service
 
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(LN_S) -f $(servicedir)/$(service_DATA)
+uninstall-local:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(RM) $(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)
+
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -44,8 +52,9 @@ autostart_DATA = tracker-miner-user-guides.desktop
 CLEANFILES = \
 	$(autostart_DATA) \
 	$(autostart_DATA:.desktop=.desktop.in) \
-	$(service_DATA)
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
 
 EXTRA_DIST = \
 	$(autostart_DATA:.desktop=.desktop.in.in) \
-	$(service_in_files)
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in
deleted file mode 100644
index fe7bf8efa..000000000
--- a/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Userguides
-Exec=@libexecdir@/tracker-miner-user-guides
diff --git a/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in
new file mode 100644
index 000000000..2f4857038
--- /dev/null
+++ b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Userguides
+Exec=@libexecdir@/tracker-miner-user-guides
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Userguides
+_DisplayName=Userguides
+_Comment=Userguide data miner
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index f818ea25d..6b5d8ff3f 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -44,15 +44,29 @@ CLEANFILES = \
 EXTRA_DIST = org-freedesktop-Tracker-evolution-plugin.eplug.xml
 
 # DBus interfaces (XML files) and services
-service_in_files = org.freedesktop.Tracker1.Miner.EMails.service.in
-
-%.service: %.service.in
+%.service.in: %.service.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.EMails.service
 
-@INTLTOOL_DESKTOP_RULE@
-
-CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST += $(desktop_in_in_files) $(service_in_files)
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(LN_S) -f $(servicedir)/$(service_DATA)
+uninstall-local:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(RM) $(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)
+
+# Dist / Clean rules for all data
+CLEANFILES += \
+	$(autostart_DATA) \
+	$(desktop_in_files) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
+
+EXTRA_DIST += \
+	$(desktop_in_in_files) \
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in
deleted file mode 100644
index 3fadda59c..000000000
--- a/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Emails
diff --git a/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in
new file mode 100644
index 000000000..e9b233eed
--- /dev/null
+++ b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in
@@ -0,0 +1,7 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Emails
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Emails
+_DisplayName=Emails
+_Comment=Evolution Email miner
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 88ab25c3d..b8ceaa8a0 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -595,12 +595,22 @@ config_DATA = \
 	tracker-extract.xml \
 	tracker-extract-priority.xml
 
-%.service: %.service.in
+%.service.in: %.service.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Miner.Extract.service
 
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(LN_S) -f $(servicedir)/$(service_DATA)
+uninstall-local:
+	cd $(DESTDIR)$(datadir)/tracker/miners && \
+		$(RM) $(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)
+
 # Desktop files: First we fix the VERSION and libexecdir
 %.desktop.in: %.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -626,10 +636,11 @@ CLEANFILES += \
 	$(autostart_DATA) \
 	$(autostart_DATA:.desktop=.desktop.in) \
 	$(service_DATA) \
+	$(service_DATA:.service=.service.in) \
 	$(gsettings_SCHEMAS)
 
 EXTRA_DIST += \
 	$(autostart_DATA:.desktop=.desktop.in.in) \
-	$(service_DATA:.service=.service.in) \
 	$(config_DATA) \
+	$(service_DATA:.service=.service.in.in) \
 	$(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
deleted file mode 100644
index 1df29c67c..000000000
--- a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Extract
-Exec=@libexecdir@/tracker-extract
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
new file mode 100644
index 000000000..5c4ad1411
--- /dev/null
+++ b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Extract
+Exec=@libexecdir@/tracker-extract
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Extract
+_DisplayName=Extractor
+_Comment=Metadata extractor
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 391c7ebf1..89959b8b5 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -67,8 +67,6 @@ tracker_writeback_LDADD = \
 configdir = $(datadir)/tracker
 config_DATA = tracker-writeback.xml
 
-service_in_files = org.freedesktop.Tracker1.Writeback.service.in
-
 %.service: %.service.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
 
@@ -86,5 +84,11 @@ gsettings_SCHEMAS = org.freedesktop.Tracker.Writeback.gschema.xml
 @GSETTINGS_RULES@
 
 # Dist / Clean rules for all data
-CLEANFILES = $(service_DATA) $(gsettings_SCHEMA)
-EXTRA_DIST = $(service_in_files) $(config_DATA) $(gsettings_SCHEMAS:.xml=.xml.in)
+CLEANFILES = \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST = \
+	$(service_DATA:.service=.service.in) \
+	$(config_DATA) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)