[gvfs] Use conventional naming for D-Bus session services

[Ondrej Holy <oholy src gnome org>]

commit 957fff5be2b3cb2a3356955f5c51c94bcd256fed
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Sep 22 20:14:40 2015 +0100

    Use conventional naming for D-Bus session services
    
    This naming is mandatory for the system bus, but is also recommended
    for the session bus.
    
    The D-Bus maintainers recommend that all activatable session services'
    service files are named according to the bus name, so that any conflict
    is resolved in a deterministic way. If the services are in different
    directories (precedence levels) the result is the same as it is now:
    the higher precedence "wins". If the services are in the same
    directory, either one overwrites the other and consistently "wins",
    or a packaging system like dpkg prevents co-installation.
    
    If the service files were named differently, it would be possible
    to have two implementations for the same name. dbus-daemon resolves
    this by choosing one arbitrarily, not necessarily the same one every
    time. systemd's kdbus support is more strict (or less concerned with
    backwards compatibility), and treats this situation as an error.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=755760

 daemon/Makefile.am                                 |    9 +++++----
 ...on.service.in => org.gtk.vfs.Daemon.service.in} |    0
 metadata/Makefile.am                               |   10 ++++------
 ....service.in => org.gtk.vfs.Metadata.service.in} |    0
 4 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index dbe3916..da3d728 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -36,8 +36,8 @@ gvfs_gschemas_convert_dist =
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
 servicedir = $(DBUS_SERVICE_DIR)
-service_in_files = gvfs-daemon.service.in
-service_DATA = gvfs-daemon.service
+service_in_files = org.gtk.vfs.Daemon.service.in
+service_DATA = org.gtk.vfs.Daemon.service
 
 %.mount: %.mount.in ../config.log
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
@@ -136,17 +136,18 @@ endif
 noinst_DATA = $(mount_DATA:.mount=.localmount)
 
 EXTRA_DIST =                           \
-       gvfs-daemon.service.in          \
+       $(service_in_files)             \
        $(mount_in_files)               \
        $(gvfs_gschemas_dist)           \
        $(gvfs_gschemas_convert_dist)   \
        $(gsettings_ENUM_FILES)         \
        $(NULL)
 
-DISTCLEANFILES = gvfs-daemon.service $(mount_DATA) $(noinst_DATA)
+DISTCLEANFILES = $(mount_DATA) $(noinst_DATA)
 
 CLEANFILES =                                   \
        $(gsettings__enum_file)                 \
+       $(service_DATA)                         \
        *.gschema.valid
 
 noinst_PROGRAMS =                              \
diff --git a/daemon/gvfs-daemon.service.in b/daemon/org.gtk.vfs.Daemon.service.in
similarity index 100%
rename from daemon/gvfs-daemon.service.in
rename to daemon/org.gtk.vfs.Daemon.service.in
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 905e805..9490cd6 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -69,17 +69,15 @@ gvfsd_metadata_CFLAFGS = $(UDEV_CFLAGS)
        $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
 servicedir = $(DBUS_SERVICE_DIR)
-service_in_files = gvfs-metadata.service.in
-service_DATA = gvfs-metadata.service
+service_in_files = org.gtk.vfs.Metadata.service.in
+service_DATA = org.gtk.vfs.Metadata.service
 
 EXTRA_DIST =                           \
-       gvfs-metadata.service.in        \
+       $(service_in_files)             \
        dbus-interface.xml              \
        $(NULL)
 
-clean-local:
-       rm -f gvfs-metadata.service
-
 CLEANFILES =                           \
        $(dbus_built_sources)           \
+       $(service_DATA)                 \
        $(NULL)
diff --git a/metadata/gvfs-metadata.service.in b/metadata/org.gtk.vfs.Metadata.service.in
similarity index 100%
rename from metadata/gvfs-metadata.service.in
rename to metadata/org.gtk.vfs.Metadata.service.in