sync-monitor

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

  1. split-calendar-and-contacts
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 39
Merged at revision: 36
Proposed branch: lp:~renatofilho/sync-monitor/split-calendar-and-contacts
Merge into: lp:sync-monitor
Diff against target: 131 lines (+1/-47)
6 files modified
accounts/applications/CMakeLists.txt (+0/-2)
accounts/applications/calendar-sync.application.in (+0/-12)
accounts/applications/contacts-sync.application.in (+0/-12)
accounts/services/google-caldav.service.in (+0/-16)
debian/control (+1/-2)
debian/sync-monitor-uoa.install (+0/-3)
To merge this branch: bzr merge lp:~renatofilho/sync-monitor/split-calendar-and-contacts
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+230239@code.launchpad.net

Commit message

Do no install calendar online account application file.

This will be installed by the calendar app.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
33. By Renato Araujo Oliveira Filho

Does not install calendar sync application file.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
34. By Renato Araujo Oliveira Filho

Removed unnecessary code or service file.

35. By Renato Araujo Oliveira Filho

Trunk merged.

36. By Renato Araujo Oliveira Filho

Added missing file.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
37. By Renato Araujo Oliveira Filho

Avoid break packages during the instalation.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
38. By Renato Araujo Oliveira Filho

Add Breaks property for new packages.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
39. By Renato Araujo Oliveira Filho

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Bill Filler (bfiller) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1set(APPLICATION_FILES1set(APPLICATION_FILES
2 contacts-sync.application2 contacts-sync.application
3 calendar-sync.application
4)3)
54
6set(APPLICATION_OUTPUT_FILES5set(APPLICATION_OUTPUT_FILES
7 ${CMAKE_CURRENT_BINARY_DIR}/contacts-sync.application6 ${CMAKE_CURRENT_BINARY_DIR}/contacts-sync.application
8 ${CMAKE_CURRENT_BINARY_DIR}/calendar-sync.application
9)7)
108
119
1210
=== 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 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<application id="calendar-sync">
3 <_description>Calendar</_description>
4 <desktop-entry>sync-monitor-calendar.desktop</desktop-entry>
5 <translations>calendar-sync</translations>
6
7 <service-types>
8 <service-type id="calendar">
9 <_description>Synchronize your calendar</_description>
10 </service-type>
11 </service-types>
12</application>
130
=== 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 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<application id="contacts-sync">
3 <_description>Contacts</_description>
4 <desktop-entry>sync-monitor-contacts.desktop</desktop-entry>
5 <translations>contacts-sync</translations>
6
7 <service-types>
8 <service-type id="contacts">
9 <_description>Synchronize your contacts</_description>
10 </service-type>
11 </service-types>
12</application>
013
=== 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 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<application id="contacts-sync">
3 <_description>Contacts</_description>
4 <desktop-entry>sync-monitor-contacts.desktop</desktop-entry>
5 <translations>contacts-sync</translations>
6
7 <service-types>
8 <service-type id="contacts">
9 <_description>Synchronize your contacts</_description>
10 </service-type>
11 </service-types>
12</application>
130
=== 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 @@
4 <name>Google Calendar</name>4 <name>Google Calendar</name>
5 <provider>google</provider>5 <provider>google</provider>
6 <icon>calendar</icon>6 <icon>calendar</icon>
7
8 <!-- default settings (account settings have precedence over these) -->
9 <template>
10 <group name="auth">
11 <setting name="method">oauth2</setting>
12 <setting name="mechanism">web_server</setting>
13 <group name="oauth2">
14 <group name="web_server">
15 <setting type="as" name="Scope">['email','https://www.googleapis.com/auth/calendar']</setting>
16 <!-- workaround for (g)signond token cache issue: use different client IDs for each service and the provider -->
17 <setting name="ClientId">759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com</setting>
18 <setting name="ClientSecret">juFngKUcuhB7IRQqHtSLavqJ</setting>
19 </group>
20 </group>
21 </group>
22 </template>
23</service>7</service>
248
=== 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 @@
46Depends: ${misc:Depends},46Depends: ${misc:Depends},
47 sync-monitor (>= ${binary:Version}),47 sync-monitor (>= ${binary:Version}),
48Description: Ubuntu online account sync monitor plugin - service files48Description: Ubuntu online account sync monitor plugin - service files
49 sync-monitor manages data synchronization of contacts and calendars49 sync-monitor manages data synchronization of calendars and contacts.
50 .50 .
51 With this package you can keep track of Ubuntu online accounts and sync 51 With this package you can keep track of Ubuntu online accounts and sync
52 with the cloud.52 with the cloud.
53 .53 .
54 This package contains the ubuntu online accounts service files.54 This package contains the ubuntu online accounts service files.
5555
56
57Package: qtdeclarative5-ubuntu-syncmonitor0.156Package: qtdeclarative5-ubuntu-syncmonitor0.1
58Architecture: any57Architecture: any
59Multi-Arch: same58Multi-Arch: same
6059
=== 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 @@
1usr/share/accounts/services/google-caldav.service
2usr/share/accounts/services/yahoo-caldav.service
3usr/share/accounts/services/google-carddav.service
4usr/share/accounts/services/yahoo-carddav.service
5usr/share/applications/sync-monitor-contacts.desktop
6usr/share/applications/sync-monitor-calendar.desktop
7usr/share/accounts/applications/contacts-sync.application
08
=== 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 @@
1usr/share/accounts
2usr/share/applications/sync-monitor-contacts.desktop
3usr/share/applications/sync-monitor-calendar.desktop

Subscribers

People subscribed via source and target branches