indicator-power

Merge lp://staging/~charlesk/indicator-power/lp-1354058-use-standard-translations-cmake-file into lp://staging/indicator-power/14.10

  1. lp-1354058-use-standard-translations-cmake-file
  2. Merge into trunk.14.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 254
Merged at revision: 254
Proposed branch: lp://staging/~charlesk/indicator-power/lp-1354058-use-standard-translations-cmake-file
Merge into: lp://staging/indicator-power/14.10
Diff against target: 34 lines (+8/-12)
1 file modified
cmake/Translations.cmake (+8/-12)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-power/lp-1354058-use-standard-translations-cmake-file
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+230216@code.staging.launchpad.net

Commit message

Re-use the same Translations.cmake file across indicators

Description of the change

Sync Translations.cmake with the bugfixed version that recently landed in indicator-datetime.

Discussion @ https://code.launchpad.net/~charlesk/indicator-datetime/lp-1354058-include-cpp-files-when-invoking-xgettext/+merge/229976

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

FAILED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/123/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/24/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/123/rebuild

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

Looks like ths 2014-08-09 build failure came from a gcovr bug introduced in 3.1,<https://github.com/gcovr/gcovr/issues/37> which just landed in utopic. mterry's now backported the fix from 3.2 <https://launchpad.net/ubuntu/+source/gcovr/3.1-1ubuntu1>

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

FAILED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/124/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-amd64-ci/25/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/124/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/26/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/125/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches