[tracker/tracker-store] Renamed DBus service files and desktop files for miner-fs

[Martyn James Russell <mr src gnome org>]

commit 2d52698541a640e9dbf3da59aca77841acafcdb5
Author: Martyn Russell <martyn imendio com>
Date:   Mon Jun 29 16:24:33 2009 +0100

    Renamed DBus service files and desktop files for miner-fs

 data/Makefile.am                                   |   29 ++++++++---
 data/dbus/Makefile.am                              |    3 +-
 ...=> org.freedesktop.Tracker.Miner.FS.service.in} |    2 +-
 data/dbus/tracker-indexer.xml                      |   56 --------------------
 data/tracker-store.desktop.in.in                   |    9 ++--
 5 files changed, 28 insertions(+), 71 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 14cfcb1..f249025 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,20 +2,33 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = db dbus modules languages icons ontologies
 
+# Should do this for *.desktop.in.in 
 tracker-store.desktop.in: tracker-store.desktop.in.in
-	@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|" 	\
+	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
+
+tracker-miner-fs.desktop.in: tracker-miner-fs.desktop.in.in
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|" 	\
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_in_files = tracker-store.desktop.in.in
-autostart_in_files = tracker-store.desktop.in
-autostart_DATA = tracker-store.desktop
+autostart_in_in_files = 				\
+	tracker-store.desktop.in.in			\
+	tracker-miner-fs.desktop.in.in
+
+autostart_in_files = 					\
+	tracker-store.desktop.in			\
+	tracker-miner-fs.desktop.in
+
+autostart_DATA = 					\
+	tracker-store.desktop				\
+	tracker-miner-fs.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = 			\
-	tracker-$(TRACKER_API_VERSION).pc	\
+pkgconfig_DATA = 					\
+	tracker-$(TRACKER_API_VERSION).pc		\
 	tracker-module-$(TRACKER_API_VERSION).pc
 
 tracker-$(TRACKER_API_VERSION).pc: tracker.pc
@@ -24,7 +37,9 @@ tracker-$(TRACKER_API_VERSION).pc: tracker.pc
 tracker-module-$(TRACKER_API_VERSION).pc: tracker-module.pc
 	cp $< $@
 
-CLEANFILES = $(autostart_DATA) $(autostart_in_files)	\
+CLEANFILES = 						\
+	$(autostart_DATA) 				\
+	$(autostart_in_files)				\
 	tracker-$(TRACKER_API_VERSION).pc		\
 	tracker-module-$(TRACKER_API_VERSION).pc
 
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index f4fc891..e547901 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -7,7 +7,6 @@ config_DATA =						\
 	tracker-daemon.xml				\
 	tracker-resources.xml				\
 	tracker-search.xml				\
-	tracker-indexer.xml				\
 	tracker-extract.xml				\
 	tracker-resources-class.xml
 
@@ -15,7 +14,7 @@ config_DATA =						\
 servicedir = $(DBUS_SERVICES_DIR)
 service_in_files =					\
 	org.freedesktop.Tracker.service.in		\
-	org.freedesktop.Tracker.Indexer.service.in	\
+	org.freedesktop.Tracker.Miner.FS.service.in	\
 	org.freedesktop.Tracker.Extract.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
diff --git a/data/dbus/org.freedesktop.Tracker.Indexer.service.in b/data/dbus/org.freedesktop.Tracker.Miner.FS.service.in
similarity index 60%
rename from data/dbus/org.freedesktop.Tracker.Indexer.service.in
rename to data/dbus/org.freedesktop.Tracker.Miner.FS.service.in
index c5d20ab..4236f97 100644
--- a/data/dbus/org.freedesktop.Tracker.Indexer.service.in
+++ b/data/dbus/org.freedesktop.Tracker.Miner.FS.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Tracker.Indexer
-Exec= libexecdir@/tracker-indexer
+Exec= libexecdir@/tracker-miner-fs
diff --git a/data/tracker-store.desktop.in.in b/data/tracker-store.desktop.in.in
index 0c2f2c3..bbf943a 100644
--- a/data/tracker-store.desktop.in.in
+++ b/data/tracker-store.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Tracker
-_Comment=Tracker search and indexing service
+_Name=Tracker Store
+_Comment=Metadata database store and lookup manager
 Icon=
 Exec= libexecdir@/tracker-store
 Terminal=false
 Type=Application
-Categories=
+Categories=GNOME;Utility
 X-GNOME-Autostart-enabled=true
 X-KDE-autostart-after=panel
 X-KDE-StartupNotify=false
@@ -15,6 +15,5 @@ NoDisplay=true
 OnlyShowIn=GNOME;KDE;XFCE;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Indexer
+X-GNOME-Bugzilla-Component=store
 X-GNOME-Bugzilla-Version= VERSION@
-