From 6d8bc387dc5676a7d5e3d8e1d74d8e4fbf9dde83 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 12 Nov 2013 11:54:57 +0000 Subject: [PATCH] Re-namespace to im.telepathy.v1 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262 --- .gitignore | 4 ++-- configure.ac | 2 +- data/Makefile.am | 2 +- data/im.telepathy.v1.ConnectionManager.sofiasip.service.in | 3 +++ data/im.telepathy1.ConnectionManager.sofiasip.service.in | 3 --- tests/twisted/constants.py | 2 +- tests/twisted/tools/Makefile.am | 4 ++-- tests/twisted/tools/sofiasip.service.in | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 data/im.telepathy.v1.ConnectionManager.sofiasip.service.in delete mode 100644 data/im.telepathy1.ConnectionManager.sofiasip.service.in diff --git a/.gitignore b/.gitignore index 8cfccfe..d02e6f9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,10 @@ src/telepathy-rakia src/write-mgr-file extensions/_gen extensions/extensions.html -data/im.telepathy1.ConnectionManager.*.service +data/im.telepathy.v1.ConnectionManager.*.service docs/telepathy-rakia.8 tests/twisted/tools/exec-with-log.sh -tests/twisted/tools/im.telepathy1.ConnectionManager.*.service +tests/twisted/tools/im.telepathy.v1.ConnectionManager.*.service tests/twisted/tools/rakia-testing.log tests/twisted/tools/tmp-session-bus.conf diff --git a/configure.ac b/configure.ac index 7d53a27..7a05148 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,7 @@ AC_DEFINE(TP_SEAL_ENABLE, [], [Prevent to use sealed variables]) AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, [], [Disable single header include]) AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0], [Ignore post 1.0 deprecations]) AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0], [Prevent post 1.0 APIs]) -PKG_CHECK_MODULES([TELEPATHY_GLIB], [telepathy-glib-1 >= 0.99.2, telepathy-glib-1-dbus >= 0.99.2]) +PKG_CHECK_MODULES([TELEPATHY_GLIB], [telepathy-glib-1 >= 0.99.5, telepathy-glib-1-dbus >= 0.99.5]) dnl Check for optional IP heartbeat support AC_ARG_WITH(iphb, diff --git a/data/Makefile.am b/data/Makefile.am index 98fdf46..506b13a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ BUILT_FILES = $(service_in_files:.service.in=.service) servicedir = $(datadir)/dbus-1/services -service_in_files = im.telepathy1.ConnectionManager.sofiasip.service.in +service_in_files = im.telepathy.v1.ConnectionManager.sofiasip.service.in service_DATA = $(BUILT_FILES) CLEANFILES = $(BUILT_FILES) diff --git a/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in b/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in new file mode 100644 index 0000000..3f836f7 --- /dev/null +++ b/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=im.telepathy.v1.ConnectionManager.sofiasip +Exec=@libexecdir@/telepathy-rakia diff --git a/data/im.telepathy1.ConnectionManager.sofiasip.service.in b/data/im.telepathy1.ConnectionManager.sofiasip.service.in deleted file mode 100644 index 54c409a..0000000 --- a/data/im.telepathy1.ConnectionManager.sofiasip.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=im.telepathy1.ConnectionManager.sofiasip -Exec=@libexecdir@/telepathy-rakia diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py index 9afe44e..ff0f0a1 100644 --- a/tests/twisted/constants.py +++ b/tests/twisted/constants.py @@ -22,7 +22,7 @@ Some handy constants for other tests to share and enjoy. from dbus import PROPERTIES_IFACE, INTROSPECTABLE_IFACE -PREFIX = "im.telepathy1" +PREFIX = "im.telepathy.v1" PATH_PREFIX = '/' + PREFIX.replace('.', '/') tp_name_prefix = PREFIX diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am index d63b4f3..05d9b82 100644 --- a/tests/twisted/tools/Makefile.am +++ b/tests/twisted/tools/Makefile.am @@ -9,12 +9,12 @@ exec-with-log.sh: exec-with-log.sh.in # We don't use the full filename for the .in because > 99 character filenames # in tarballs are non-portable (and automake 1.8 doesn't let us build # non-archaic tarballs) -im.telepathy1.ConnectionManager.%.service: %.service.in +im.telepathy.v1.ConnectionManager.%.service: %.service.in sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ # D-Bus service file for testing service_in_files = sofiasip.service.in -service_files = im.telepathy1.ConnectionManager.sofiasip.service +service_files = im.telepathy.v1.ConnectionManager.sofiasip.service # D-Bus config file for testing conf_in_files = tmp-session-bus.conf.in diff --git a/tests/twisted/tools/sofiasip.service.in b/tests/twisted/tools/sofiasip.service.in index c0e87b1..8482c81 100644 --- a/tests/twisted/tools/sofiasip.service.in +++ b/tests/twisted/tools/sofiasip.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=im.telepathy1.ConnectionManager.sofiasip +Name=im.telepathy.v1.ConnectionManager.sofiasip Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh -- 1.8.4.2