data: Moved data/dbus/* to their respective src directories

This way, we keep DBus service and XML config data WITH the process or binary
that it belongs to, keeping all sources grouped together.

39 files changed, 131 insertions, 199 deletions

diff --git a/configure.ac b/configure.ac
index 552141b2c..fc6afe77f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2556,7 +2556,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
 ##################################################################
 
 AC_CONFIG_FILES([
-	data/dbus/Makefile
 	data/gschemas/Makefile
 	data/languages/Makefile
 	data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index e9d74cb29..aa3f18cc2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = dbus languages miners gschemas
+SUBDIRS = languages miners gschemas
diff --git a/data/dbus/.gitignore b/data/dbus/.gitignore
deleted file mode 100644
index 0e3ad1b06..000000000
--- a/data/dbus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.service
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
deleted file mode 100644
index 402ce17e9..000000000
--- a/data/dbus/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-configdir = $(datadir)/tracker
-
-config_DATA = \
-	tracker-backup.xml \
-	tracker-extract.xml \
-	tracker-extract-priority.xml \
-	tracker-miner.xml \
-	tracker-miner-web.xml \
-	tracker-resources.xml \
-	tracker-statistics.xml \
-	tracker-writeback.xml \
-	tracker-status.xml
-
-config_noinst = \
-	tracker-miner-files-index.xml
-
-# Services
-service_in_files = \
-	org.freedesktop.Tracker1.service.in \
-	org.freedesktop.Tracker1.Miner.Applications.service.in \
-	org.freedesktop.Tracker1.Miner.EMails.service.in \
-	org.freedesktop.Tracker1.Miner.Files.service.in \
-	org.freedesktop.Tracker1.Miner.Userguides.service.in \
-	org.freedesktop.Tracker1.Miner.RSS.service.in  \
-	org.freedesktop.Tracker1.Miner.Extract.service.in \
-	org.freedesktop.Tracker1.Writeback.service.in
-
-%.service: %.service.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
-
-# Services
-servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = \
-	org.freedesktop.Tracker1.service \
-	org.freedesktop.Tracker1.Writeback.service
-
-if HAVE_TRACKER_MINER_FS
-service_DATA += \
-	org.freedesktop.Tracker1.Miner.Extract.service \
-	org.freedesktop.Tracker1.Miner.Files.service \
-	org.freedesktop.Tracker1.Miner.Applications.service
-endif
-
-if HAVE_TRACKER_MINER_EVOLUTION
-service_DATA += org.freedesktop.Tracker1.Miner.EMails.service
-endif
-
-if HAVE_TRACKER_MINER_RSS
-service_DATA += org.freedesktop.Tracker1.Miner.RSS.service
-endif
-
-if HAVE_TRACKER_MINER_USER_GUIDES
-service_DATA += org.freedesktop.Tracker1.Miner.Userguides.service
-endif
-
-EXTRA_DIST = \
-	$(service_in_files) \
-	$(config_DATA) \
-	$(config_noinst)
-
-CLEANFILES = $(service_DATA)
diff --git a/data/dbus/tracker-miner-web.xml b/data/dbus/tracker-miner-web.xml
deleted file mode 100644
index 83bd1d41b..000000000
--- a/data/dbus/tracker-miner-web.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<node name="/">
-  <interface name="org.freedesktop.Tracker1.Miner.Web">
-    <method name="Authenticate">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Tries to authenticate the miner against the remote web service.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </method>
-    <method name="GetAssociationData">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Returns a hash containing the information necessary to know how to
-            associate the miner to its web service. Association is the action
-            of "binding" the miner and the web service, that is asking user
-            approval to be granted the right to access the data.
-            A miner must be associated before being able to download data.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-      <arg name="result" type="a{ss}" direction="out">
-        <doc:doc>
-          <doc:summary>
-            <doc:para>
-              A hash containing the association information. Its keys depend on
-              the type of association.
-              For a token based association, the following keys are always
-              defined:
-              * url: A url where the user can follow the association procedure.
-                     The page at this URL generally checks the user's
-                     credentials, and asks him to approve the service.
-                     When the user is done with the procedure, he has to notify
-                     the miner manager, which will then call the Associate
-                     method.
-              For a token based association, the following keys might be
-              defined:
-              * post_message: A message to display after he returns from the
-                              association procedure
-              * post_url: A url to point the user to after he returns from the
-                          association procedure
-              If both post_message and post_url are defined, the message will
-              shown to the user before he is pointer to post_url.
-              For a user/pass based based association, the hash table should be
-              empty, real association is done using the Associate method.
-            </doc:para>
-          </doc:summary>
-        </doc:doc>
-      </arg>
-    </method>
-    <method name="Associate">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Associates the miner with its web service using the provided
-            association data. After this step (if successful), the miner
-            should be able to access the online data.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-      <arg name="data" type="a{ss}" direction="in">
-        <doc:doc>
-          <doc:summary>
-            <doc:para>
-              A hash containing the association information. Its keys depend on
-              the type of association.
-              For a token based association, the hash should be empty. The miner
-              should get the definitive token from the remote web service, and
-              store it using the password provider.
-              For a user/pass based based association, the following keys
-              should be defined:
-              * username: The username provided by the user
-              * password: The password provided by the user
-              In the case of a user/pass association, the miner should use the
-              provided credentials to check the login against the remote web
-              service, and store them if successful.
-            </doc:para>
-          </doc:summary>
-        </doc:doc>
-      </arg>
-    </method>
-    <method name="Dissociate">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Dissociates the miner from its web service. When called, the miner
-            should delete any credentials it has guarded using the password
-            provider, and if possible revoke the authorization from the remote
-            service.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </method>
-    <property name="Associated" type="b" access="read">
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Holds the current association status of the miner. The possible values are
-            defined in tracker-miner-web.h.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-  </interface>
-</node>
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 222df57df..d9c7c8d66 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -196,3 +196,9 @@ build-vapi: TrackerMiner-$(TRACKER_API_VERSION).gir
 	@vapigen --library tracker-miner --metadatadir $(top_srcdir) --pkg gio-2.0 --vapidir $(top_builddir)/src/libtracker-sparql --pkg tracker-sparql-$(TRACKER_API_VERSION) TrackerMiner-$(TRACKER_API_VERSION).gir
 
 endif
+
+# DBus interfaces (XML files)
+configdir = $(datadir)/tracker
+config_DATA = tracker-miner.xml
+
+EXTRA_DIST += $(config_DATA)
diff --git a/data/dbus/tracker-miner.xml b/src/libtracker-miner/tracker-miner.xml
index 6256c12d4..6256c12d4 100644
--- a/data/dbus/tracker-miner.xml
+++ b/src/libtracker-miner/tracker-miner.xml
diff --git a/src/miners/apps/.gitignore b/src/miners/apps/.gitignore
index ecce41d91..2d014f80d 100644
--- a/src/miners/apps/.gitignore
+++ b/src/miners/apps/.gitignore
@@ -1 +1,2 @@
 tracker-miner-apps
+*.service
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 18f0c3cc3..9c69381cc 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -21,6 +21,15 @@ tracker_miner_apps_LDADD =                             \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_APPS_LIBS)
 
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.Applications.service.in
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Applications.service
+
 # Desktop files: First we fix the VERSION and libexecdir
 tracker-miner-apps.desktop.in: tracker-miner-apps.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -34,5 +43,5 @@ autostart_DATA = tracker-miner-apps.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
index ecd1fdac4..ecd1fdac4 100644
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in
+++ b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
diff --git a/src/miners/fs/.gitignore b/src/miners/fs/.gitignore
index 175a9f542..064ac1197 100644
--- a/src/miners/fs/.gitignore
+++ b/src/miners/fs/.gitignore
@@ -1 +1,2 @@
 tracker-miner-fs
+*.service
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 0787525ab..495d724a6 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -50,6 +50,18 @@ tracker_miner_fs_LDADD =                               \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_FS_LIBS)
 
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = tracker-miner-files-index.xml
+
+service_in_files = org.freedesktop.Tracker1.Miner.Files.service.in
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Files.service
+
 # Desktop files: First we fix the VERSION and libexecdir
 if HAVE_LIBMEDIAART
 requires="libmediaart-1.0"
@@ -69,5 +81,5 @@ autostart_DATA = tracker-miner-fs.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(config_DATA) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
index 7563d49d0..7563d49d0 100644
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in
+++ b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
diff --git a/data/dbus/tracker-miner-files-index.xml b/src/miners/fs/tracker-miner-files-index.xml
index afe336401..afe336401 100644
--- a/data/dbus/tracker-miner-files-index.xml
+++ b/src/miners/fs/tracker-miner-files-index.xml
diff --git a/src/miners/rss/.gitignore b/src/miners/rss/.gitignore
index 2cf77a727..62c2dec7e 100644
--- a/src/miners/rss/.gitignore
+++ b/src/miners/rss/.gitignore
@@ -1 +1,2 @@
 tracker-miner-rss
+*.service
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index fc94c3803..355564996 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -21,6 +21,15 @@ tracker_miner_rss_LDADD =                              \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_RSS_LIBS)
 
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.RSS.service.in
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.RSS.service
+
 # Desktop files: First we fix the VERSION and libexecdir
 tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -34,5 +43,5 @@ autostart_DATA = tracker-miner-rss.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
index 539e32e12..539e32e12 100644
--- a/data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in
+++ b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
diff --git a/src/miners/user-guides/.gitignore b/src/miners/user-guides/.gitignore
index b5e2e9627..53909a707 100644
--- a/src/miners/user-guides/.gitignore
+++ b/src/miners/user-guides/.gitignore
@@ -1 +1,2 @@
 tracker-miner-user-guides
+*.service
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 529b7af97..6ffe0a9dc 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -21,6 +21,15 @@ tracker_miner_user_guides_LDADD =                      \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_USER_GUIDES_LIBS)
 
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.Userguides.service.in
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Userguides.service
+
 # Desktop files: First we fix the VERSION and libexecdir
 tracker-miner-user-guides.desktop.in: tracker-miner-user-guides.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -34,5 +43,5 @@ autostart_DATA = tracker-miner-user-guides.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in
index fe7bf8efa..fe7bf8efa 100644
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in
+++ b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in
diff --git a/src/plugins/evolution/.gitignore b/src/plugins/evolution/.gitignore
index f92a4cec7..954b62057 100644
--- a/src/plugins/evolution/.gitignore
+++ b/src/plugins/evolution/.gitignore
@@ -1 +1,2 @@
 *.eplug
+*.service
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index dd9823d82..f818ea25d 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -35,14 +35,24 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_EVOLUTION_LIBS)
 
-@INTLTOOL_DESKTOP_RULE@
+BUILT_SOURCES = $(eplugin_DATA)
 
-BUILT_SOURCES =                                        \
+CLEANFILES = \
+	$(BUILT_SOURCES) \
 	$(eplugin_DATA)
 
-CLEANFILES =                                           \
-	$(BUILT_SOURCES)                               \
-	$(eplugin_DATA)
+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
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.EMails.service
+
+@INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST =                                           \
-	org-freedesktop-Tracker-evolution-plugin.eplug.xml
+CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST += $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in
index 3fadda59c..3fadda59c 100644
--- a/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
+++ b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in
diff --git a/src/tracker-extract/.gitignore b/src/tracker-extract/.gitignore
index 9765d48b2..0ec6299ae 100644
--- a/src/tracker-extract/.gitignore
+++ b/src/tracker-extract/.gitignore
@@ -2,4 +2,4 @@ tracker-extract
 tracker-extract-priority-dbus-stamp
 tracker-extract-priority-dbus.c
 tracker-extract-priority-dbus.h
-
+*.service
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index f20b33d5a..2c1adb122 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -571,12 +571,12 @@ tracker-extract-priority-dbus.c: tracker-extract-priority-dbus-stamp
 tracker-extract-priority-dbus.h: tracker-extract-priority-dbus-stamp
 	@:
 
-tracker-extract-priority-dbus-stamp: Makefile.am $(top_srcdir)/data/dbus/tracker-extract-priority.xml
+tracker-extract-priority-dbus-stamp: Makefile.am $(top_srcdir)/src/tracker-extract/tracker-extract-priority.xml
 	$(AM_V_GEN) $(GDBUS_CODEGEN) \
 	              --interface-prefix org.freedesktop.Tracker1.Extract. \
 	              --generate-c-code tracker-extract-priority-dbus \
 	              --c-namespace TrackerExtractDBus \
-	              $(top_srcdir)/data/dbus/tracker-extract-priority.xml
+	              $(top_srcdir)/src/tracker-extract/tracker-extract-priority.xml
 	touch $@
 
 BUILT_SOURCES = \
@@ -589,6 +589,20 @@ CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = $(rules_files)
 
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = \
+	tracker-extract.xml \
+	tracker-extract-priority.xml
+
+service_in_files = org.freedesktop.Tracker1.Miner.Extract.service.in
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Extract.service
+
 # Desktop files: First we fix the VERSION and libexecdir
 tracker-extract.desktop.in: tracker-extract.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -602,5 +616,5 @@ autostart_DATA = tracker-extract.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES += $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST += $(desktop_in_in_files)
+CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST += $(desktop_in_in_files) $(config_DATA) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
index 1df29c67c..1df29c67c 100644
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in
+++ b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
diff --git a/data/dbus/tracker-extract-priority.xml b/src/tracker-extract/tracker-extract-priority.xml
index 2220177cb..2220177cb 100644
--- a/data/dbus/tracker-extract-priority.xml
+++ b/src/tracker-extract/tracker-extract-priority.xml
diff --git a/data/dbus/tracker-extract.xml b/src/tracker-extract/tracker-extract.xml
index fff17eddf..fff17eddf 100644
--- a/data/dbus/tracker-extract.xml
+++ b/src/tracker-extract/tracker-extract.xml
diff --git a/src/tracker-store/.gitignore b/src/tracker-store/.gitignore
index af38b38cc..38b95cb24 100644
--- a/src/tracker-store/.gitignore
+++ b/src/tracker-store/.gitignore
@@ -8,3 +8,4 @@ tracker-status.c
 tracker-steroids.c
 tracker-store.c
 tracker-store.h
+*.service
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 39f901309..1e47ad24f 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -66,6 +66,21 @@ EXTRA_DIST = \
 	tracker-locale-change.vapi \
 	tracker-writeback.vapi
 
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = \
+	tracker-backup.xml \
+	tracker-resources.xml \
+	tracker-statistics.xml \
+	tracker-status.xml
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.service
+
 # Desktop files: First we fix the VERSION and libexecdir
 tracker-store.desktop.in: tracker-store.desktop.in.in
 	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
@@ -79,6 +94,7 @@ autostart_DATA = tracker-store.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST += $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST += $(desktop_in_in_files) $(service_in_files) $(config_DATA)
+
 
diff --git a/data/dbus/org.freedesktop.Tracker1.service.in b/src/tracker-store/org.freedesktop.Tracker1.service.in
index 77edc00be..77edc00be 100644
--- a/data/dbus/org.freedesktop.Tracker1.service.in
+++ b/src/tracker-store/org.freedesktop.Tracker1.service.in
diff --git a/data/dbus/tracker-backup.xml b/src/tracker-store/tracker-backup.xml
index d079eee15..d079eee15 100644
--- a/data/dbus/tracker-backup.xml
+++ b/src/tracker-store/tracker-backup.xml
diff --git a/data/dbus/tracker-resources.xml b/src/tracker-store/tracker-resources.xml
index 6c1287faa..6c1287faa 100644
--- a/data/dbus/tracker-resources.xml
+++ b/src/tracker-store/tracker-resources.xml
diff --git a/data/dbus/tracker-statistics.xml b/src/tracker-store/tracker-statistics.xml
index 1f4742e45..1f4742e45 100644
--- a/data/dbus/tracker-statistics.xml
+++ b/src/tracker-store/tracker-statistics.xml
diff --git a/data/dbus/tracker-status.xml b/src/tracker-store/tracker-status.xml
index e30993953..e30993953 100644
--- a/data/dbus/tracker-status.xml
+++ b/src/tracker-store/tracker-status.xml
diff --git a/src/tracker-writeback/.gitignore b/src/tracker-writeback/.gitignore
index c9e76fd19..7d4fd4f9b 100644
--- a/src/tracker-writeback/.gitignore
+++ b/src/tracker-writeback/.gitignore
@@ -1 +1,2 @@
 tracker-writeback
+*.service
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index bac5dc1d3..a00fcdbb8 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -62,3 +62,19 @@ tracker_writeback_LDADD = \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
 	$(TRACKER_WRITEBACK_LIBS)
+
+# DBus interfaces (XML files) and services
+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}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Writeback.service
+
+EXTRA_DIST = $(service_in_files) $(config_DATA)
+
+CLEANFILES = $(service_DATA)
diff --git a/data/dbus/org.freedesktop.Tracker1.Writeback.service.in b/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
index a6924709b..a6924709b 100644
--- a/data/dbus/org.freedesktop.Tracker1.Writeback.service.in
+++ b/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
diff --git a/data/dbus/tracker-writeback.xml b/src/tracker-writeback/tracker-writeback.xml
index 50d1aaec1..50d1aaec1 100644
--- a/data/dbus/tracker-writeback.xml
+++ b/src/tracker-writeback/tracker-writeback.xml