Merge lp:~dpm/click/add-i18n-tools into lp:click/devel

Proposed by David Planella on 2014-10-30
Status: Merged
Merged at revision: 537
Proposed branch: lp:~dpm/click/add-i18n-tools
Merge into: lp:click/devel
Diff against target: 21 lines (+3/-0)
1 file modified
click/chroot.py (+3/-0)
To merge this branch: bzr merge lp:~dpm/click/add-i18n-tools
Reviewer Review Type Date Requested Status
Colin Watson 2014-10-30 Needs Fixing on 2014-10-30
PS Jenkins bot (community) continuous-integration 2014-10-30 Needs Fixing on 2014-10-30
Review via email: mp+240085@code.launchpad.net

This proposal supersedes a proposal from 2014-10-30.

Description of the change

Adds internationalization tools and CMake macros required by the new Qt Creator app and scope templates that provide internationalization code.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Michael Vogt (mvo) wrote : Posted in a previous version of this proposal

Looks good, thanks! I just checked the seeds and its fine there as well.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:448
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpm/click/add-i18n-tools/+merge/240085/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-devel-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-i386-ci/112

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/112/rebuild

review: Needs Fixing (continuous-integration)
Colin Watson (cjwatson) :
review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/chroot.py'
2--- click/chroot.py 2014-10-13 12:34:43 +0000
3+++ click/chroot.py 2014-10-30 09:17:13 +0000
4@@ -77,7 +77,9 @@
5 ],
6 "ubuntu-sdk-14.04": [
7 "cmake",
8+ "cmake-extras",
9 "google-mock:TARGET",
10+ "intltool",
11 "libboost1.54-dev:TARGET",
12 "libjsoncpp-dev:TARGET",
13 "libprocess-cpp-dev:TARGET",
14@@ -106,6 +108,7 @@
15 "cmake",
16 "cmake-extras",
17 "google-mock:TARGET",
18+ "intltool",
19 "libboost1.55-dev:TARGET",
20 "libcontent-hub-dev:TARGET",
21 "libjsoncpp-dev:TARGET",

Subscribers

People subscribed via source and target branches

to all changes: