Indicator Date and Time

Merge lp:~charlesk/indicator-datetime/add-phone-to-desktop-file into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

  1. add-phone-to-desktop-file
  2. Merge into trunk.13.10
Proposed by Charles Kerr
Status: Merged
Approved by: Charles Kerr
Approved revision: 237
Merged at revision: 238
Proposed branch: lp:~charlesk/indicator-datetime/add-phone-to-desktop-file
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 11 lines (+4/-0)
1 file modified
data/com.canonical.indicator.datetime (+4/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/add-phone-to-desktop-file
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+175051@code.launchpad.net

Commit message

Add a phone entry in the datetime .indicator file

Description of the change

Add a phone entry in the datetime .indicator file

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

FAILED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/27
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/73/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Makes sense as a first step.

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

FAILED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/28
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/74/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Will conduct this through; flaky pandaboards causing spurious failures.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/19/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-autolanding/13/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Perhaps I was too hasty, do we want to approve this upon Jenkins success?

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

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/75/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Top-approving this myself since jenkins finally agreed with lars :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/com.canonical.indicator.datetime'
2--- data/com.canonical.indicator.datetime 2013-07-05 12:26:13 +0000
3+++ data/com.canonical.indicator.datetime 2013-07-16 15:50:36 +0000
4@@ -8,3 +8,7 @@
5
6 [desktop_greeter]
7 ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
8+
9+[phone]
10+ObjectPath=/com/canonical/indicator/datetime/desktop
11+

Subscribers

People subscribed via source and target branches