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

[Renato Araujo Oliveira Filho]

Removed dbus autostart service file.

We do not need dbus autostart service file we are using upstart with respawn.

To get all debug messages add this to upstart service: /usr/share/upstart/sessions/address-book-service.conf

env ADDRESS_BOOK_SERVICE_DEBUG=On
env G_MESSAGES_DEBUG=all

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-amd64-ci/48/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-i386-ci/48
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3417/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2687
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3336/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4664
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2964
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2964/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/276/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-service/remove-dbus-service-file]

134. By Renato Araujo Oliveira Filho on 2014-08-12

Added debug message on service startup.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/277/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-amd64-ci/49
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-armhf-ci/49/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-utopic-i386-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4682
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2974
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2974/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/277/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed UI labels, did you update the pot file? NO POT FILES

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-09 12:57:07 +0000
+++ CMakeLists.txt	2014-08-12 22:06:28 +0000
@@ -63,7 +63,6 @@
 add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(contacts)
-add_subdirectory(data)
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc")
     # Some tests fail when running on PPPC check bug #1294229
     message(STATUS "Tests disable for ppc")

=== removed directory 'data'
=== removed file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-06-07 18:54:26 +0000
+++ data/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.pim.service.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.service"
-               IMMEDIATE @ONLY
-)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.pim.service
-        DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbus-1/services/
-)

=== removed file 'data/com.canonical.pim.service.in'
--- data/com.canonical.pim.service.in	2013-06-07 18:54:26 +0000
+++ data/com.canonical.pim.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.pim
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-service

=== modified file 'debian/address-book-service.install'
--- debian/address-book-service.install	2014-03-13 14:36:27 +0000
+++ debian/address-book-service.install	2014-08-12 22:06:28 +0000
@@ -1,3 +1,2 @@
 usr/lib/*/address-book-service/address-book-service
-usr/share/dbus-1/services/com.canonical.pim.service
 upstart/address-book-service.conf /usr/share/upstart/sessions

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-06-17 17:03:31 +0000
+++ src/main.cpp	2014-08-12 22:06:28 +0000
@@ -80,7 +80,10 @@
     app.connect(&book, SIGNAL(stopped()), SLOT(quit()));
 
     if (book.start()) {
+        qDebug() << "Service started";
         return app.exec();
+    } else {
+        qDebug() << "Fail to start service";
     }
 }