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.

10 files changed, 0 insertions, 89 deletions

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