diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2017-02-18 15:16:57 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-02-18 15:16:57 +0100 |
| commit | 153cad41ed51b898def94ade15bde288584705f0 (patch) | |
| tree | bb2d63d293e9646cc6962ca9a4decdef03a285f7 | |
| parent | ab0b77acee82e37fe91ac2c6879b49ec4d50e936 (diff) | |
Give the D-Bus service files the correct names
Best-practice is that if you implement a session service whose
well-known name (Name field) is com.example.MyService1, and it
should be service-activatable, then it should install
${datadir}/dbus-1/services/com.example.MyService1.service.
This ensures that two non-conflicting packages cannot provide the
same service name with the same search-path priority (i.e. in the
same directory).
If there are two session services with the same Name in the same
directory, dbus-daemon will arbitrarily choose one of them, which
is unlikely to be the desired result.
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | data/org.gnome.zeitgeist.Engine.service.in (renamed from data/org.gnome.zeitgeist.service.in) | 0 | ||||
| -rw-r--r-- | extensions/fts++/Makefile.am | 6 | ||||
| -rw-r--r-- | extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in (renamed from extensions/fts++/org.gnome.zeitgeist.fts.service.in) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 4a02d40f..affb9b85 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = \ $(NULL) servicedir = $(datadir)/dbus-1/services -nodist_service_DATA = org.gnome.zeitgeist.service +nodist_service_DATA = org.gnome.zeitgeist.Engine.service bashcompletiondir = $(datadir)/bash-completion/completions dist_bashcompletion_DATA = completions/zeitgeist-daemon @@ -18,13 +18,13 @@ nodist_xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) endif CLEANFILES = \ - org.gnome.zeitgeist.service \ + org.gnome.zeitgeist.Engine.service \ PythonSerializer.pyc \ zeitgeist-datahub.desktop \ $(NULL) EXTRA_DIST = \ - org.gnome.zeitgeist.service.in \ + org.gnome.zeitgeist.Engine.service.in \ ontology2code \ $(xdgautostart_in_files) \ $(NULL) diff --git a/data/org.gnome.zeitgeist.service.in b/data/org.gnome.zeitgeist.Engine.service.in index 4b20045c..4b20045c 100644 --- a/data/org.gnome.zeitgeist.service.in +++ b/data/org.gnome.zeitgeist.Engine.service.in diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am index e1707717..4a519fb5 100644 --- a/extensions/fts++/Makefile.am +++ b/extensions/fts++/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = test pkglibexec_PROGRAMS = zeitgeist-fts servicedir = $(datadir)/dbus-1/services -nodist_service_DATA = org.gnome.zeitgeist.fts.service +nodist_service_DATA = org.gnome.zeitgeist.SimpleIndexer.service %.service: %.service.in $(AM_V_GEN)sed -e "s|@pkglibexecdir[@]|$(pkglibexecdir)|" $< > $@ @@ -84,14 +84,14 @@ zeitgeist-fts_vala.stamp: $(engine_VALASOURCES) $(zeitgeist_fts_VALASOURCES) Mak EXTRA_DIST = \ $(zeitgeist_fts_VALASOURCES) \ $(zeitgeist_fts_CSOURCES) \ - org.gnome.zeitgeist.fts.service.in \ + org.gnome.zeitgeist.SimpleIndexer.service.in \ fts.vapi \ $(NULL) CLEANFILES = \ $(BUILT_SOURCES) \ $(zeitgeist_fts_VALASOURCES:.vala=.c) \ - org.gnome.zeitgeist.fts.service \ + org.gnome.zeitgeist.SimpleIndexer.service \ $(NULL) DISTCLEANFILES = \ diff --git a/extensions/fts++/org.gnome.zeitgeist.fts.service.in b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in index 4a12ea53..4a12ea53 100644 --- a/extensions/fts++/org.gnome.zeitgeist.fts.service.in +++ b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in |