Merge lp:~renatofilho/address-book-service/dbus-activated into lp:address-book-service

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Michael Sheldon
Approved revision: 223
Merged at revision: 227
Proposed branch: lp:~renatofilho/address-book-service/dbus-activated
Merge into: lp:address-book-service
Diff against target: 50 lines (+15/-7)
4 files modified
dbus/CMakeLists.txt (+11/-5)
dbus/com.canonical.pim.service.in (+3/-0)
debian/address-book-service.install (+1/-0)
upstart/address-book-service.conf.in (+0/-2)
To merge this branch: bzr merge lp:~renatofilho/address-book-service/dbus-activated
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+307234@code.launchpad.net

Commit message

Use the service as DBUS activated.

Do not respaw the service on upstart conf file.
Create a dbus service file.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:223
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1685
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/401
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1685
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1531/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1531
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1531/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/15/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dbus/CMakeLists.txt'
2--- dbus/CMakeLists.txt 2015-09-03 20:09:42 +0000
3+++ dbus/CMakeLists.txt 2016-09-29 20:35:41 +0000
4@@ -1,5 +1,11 @@
5-configure_file(com.canonical.pim.updater.service.in ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.updater.service)
6-
7-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.updater.service
8- DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services/)
9-
10+configure_file(com.canonical.pim.updater.service.in
11+ ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.updater.service)
12+
13+configure_file(com.canonical.pim.service.in
14+ ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.service)
15+
16+install(FILES
17+ ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.updater.service
18+ ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.service
19+DESTINATION
20+ ${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services/)
21
22=== added file 'dbus/com.canonical.pim.service.in'
23--- dbus/com.canonical.pim.service.in 1970-01-01 00:00:00 +0000
24+++ dbus/com.canonical.pim.service.in 2016-09-29 20:35:41 +0000
25@@ -0,0 +1,3 @@
26+[D-BUS Service]
27+Name=com.canonical.pim
28+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-service
29
30=== modified file 'debian/address-book-service.install'
31--- debian/address-book-service.install 2016-06-03 17:00:40 +0000
32+++ debian/address-book-service.install 2016-09-29 20:35:41 +0000
33@@ -1,3 +1,4 @@
34 usr/lib/*/address-book-service/address-book-service
35 usr/share/upstart/sessions/address-book-service.conf
36 usr/share/locale/*/LC_MESSAGES/address-book-service.mo
37+usr/share/dbus-1/services/com.canonical.pim.service
38
39=== modified file 'upstart/address-book-service.conf.in'
40--- upstart/address-book-service.conf.in 2015-09-09 19:07:42 +0000
41+++ upstart/address-book-service.conf.in 2016-09-29 20:35:41 +0000
42@@ -4,8 +4,6 @@
43 start on started dbus and xsession SESSION=ubuntu-touch
44 stop on runlevel [06]
45
46-respawn
47-
48 pre-start script
49 echo "START `date`"
50 end script

Subscribers

People subscribed via source and target branches