Merge lp:~renatofilho/sync-monitor/split-calendar-and-contacts into lp:sync-monitor

[Renato Araujo Oliveira Filho]

Do no install calendar online account application file.

This will be installed by the calendar app.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/60/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/sync-monitor/split-calendar-and-contacts]

33. By Renato Araujo Oliveira Filho on 2014-09-25

Does not install calendar sync application file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/64/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/64/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/sync-monitor/split-calendar-and-contacts]

34. By Renato Araujo Oliveira Filho on 2014-09-25

Removed unnecessary code or service file.

35. By Renato Araujo Oliveira Filho on 2014-09-25

Trunk merged.

36. By Renato Araujo Oliveira Filho on 2014-09-25

Added missing file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/65/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/sync-monitor/split-calendar-and-contacts]

37. By Renato Araujo Oliveira Filho on 2014-09-25

Avoid break packages during the instalation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/66/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/67/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/sync-monitor/split-calendar-and-contacts]

38. By Renato Araujo Oliveira Filho on 2014-09-26

Add Breaks property for new packages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/68/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/sync-monitor/split-calendar-and-contacts]

39. By Renato Araujo Oliveira Filho on 2014-09-26

Use only one package to install all necessary files for online accounts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/69/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

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

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'accounts/applications/CMakeLists.txt'
--- accounts/applications/CMakeLists.txt	2014-03-12 20:01:22 +0000
+++ accounts/applications/CMakeLists.txt	2014-09-29 18:15:55 +0000
@@ -1,11 +1,9 @@
 set(APPLICATION_FILES
     contacts-sync.application
-    calendar-sync.application
 )
 
 set(APPLICATION_OUTPUT_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/contacts-sync.application
-    ${CMAKE_CURRENT_BINARY_DIR}/calendar-sync.application
 )
 
 

=== removed file 'accounts/applications/calendar-sync.application.in'
--- accounts/applications/calendar-sync.application.in	2014-08-26 08:09:51 +0000
+++ accounts/applications/calendar-sync.application.in	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="calendar-sync">
-  <_description>Calendar</_description>
-  <desktop-entry>sync-monitor-calendar.desktop</desktop-entry>
-  <translations>calendar-sync</translations>
-
-  <service-types>
-    <service-type id="calendar">
-      <_description>Synchronize your calendar</_description>
-    </service-type>
-  </service-types>
-</application>

=== added file 'accounts/applications/contacts-sync.application.in'
--- accounts/applications/contacts-sync.application.in	1970-01-01 00:00:00 +0000
+++ accounts/applications/contacts-sync.application.in	2014-09-29 18:15:55 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="contacts-sync">
+  <_description>Contacts</_description>
+  <desktop-entry>sync-monitor-contacts.desktop</desktop-entry>
+  <translations>contacts-sync</translations>
+
+  <service-types>
+    <service-type id="contacts">
+      <_description>Synchronize your contacts</_description>
+    </service-type>
+  </service-types>
+</application>

=== removed file 'accounts/applications/contacts-sync.application.in'
--- accounts/applications/contacts-sync.application.in	2014-08-26 08:09:51 +0000
+++ accounts/applications/contacts-sync.application.in	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="contacts-sync">
-  <_description>Contacts</_description>
-  <desktop-entry>sync-monitor-contacts.desktop</desktop-entry>
-  <translations>contacts-sync</translations>
-
-  <service-types>
-    <service-type id="contacts">
-      <_description>Synchronize your contacts</_description>
-    </service-type>
-  </service-types>
-</application>

=== modified file 'accounts/services/google-caldav.service.in'
--- accounts/services/google-caldav.service.in	2014-04-07 22:00:28 +0000
+++ accounts/services/google-caldav.service.in	2014-09-29 18:15:55 +0000
@@ -4,20 +4,4 @@
   <name>Google Calendar</name>
   <provider>google</provider>
   <icon>calendar</icon>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="auth">
-      <setting name="method">oauth2</setting>
-      <setting name="mechanism">web_server</setting>
-      <group name="oauth2">
-        <group name="web_server">
-          <setting type="as" name="Scope">['email','https://www.googleapis.com/auth/calendar']</setting>
-          <!-- workaround for (g)signond token cache issue: use different client IDs for each service and the provider -->
-          <setting name="ClientId">759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com</setting>
-          <setting name="ClientSecret">juFngKUcuhB7IRQqHtSLavqJ</setting>
-        </group>
-      </group>
-    </group>
-  </template>
 </service>

=== modified file 'debian/control'
--- debian/control	2014-09-05 11:49:50 +0000
+++ debian/control	2014-09-29 18:15:55 +0000
@@ -46,14 +46,13 @@
 Depends: ${misc:Depends},
          sync-monitor (>= ${binary:Version}),
 Description: Ubuntu online account sync monitor plugin - service files
- sync-monitor manages data synchronization of contacts and calendars
+ sync-monitor manages data synchronization of calendars and contacts.
  .
  With this package you can keep track of Ubuntu online accounts and sync 
  with the cloud.
  .
  This package contains the ubuntu online accounts service files.
 
-
 Package: qtdeclarative5-ubuntu-syncmonitor0.1
 Architecture: any
 Multi-Arch: same

=== added file 'debian/sync-monitor-uoa.install'
--- debian/sync-monitor-uoa.install	1970-01-01 00:00:00 +0000
+++ debian/sync-monitor-uoa.install	2014-09-29 18:15:55 +0000
@@ -0,0 +1,7 @@
+usr/share/accounts/services/google-caldav.service
+usr/share/accounts/services/yahoo-caldav.service
+usr/share/accounts/services/google-carddav.service
+usr/share/accounts/services/yahoo-carddav.service
+usr/share/applications/sync-monitor-contacts.desktop
+usr/share/applications/sync-monitor-calendar.desktop
+usr/share/accounts/applications/contacts-sync.application

=== removed file 'debian/sync-monitor-uoa.install'
--- debian/sync-monitor-uoa.install	2014-02-14 22:58:16 +0000
+++ debian/sync-monitor-uoa.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/share/accounts
-usr/share/applications/sync-monitor-contacts.desktop
-usr/share/applications/sync-monitor-calendar.desktop