Merge lp:~sergiusens/cupstream2distro-config/powerd_daily into lp:cupstream2distro-config

Proposed by Sergio Schvezov
Status: Merged
Approved by: Francis Ginther
Approved revision: 377
Merged at revision: 377
Proposed branch: lp:~sergiusens/cupstream2distro-config/powerd_daily
Merge into: lp:cupstream2distro-config
Prerequisite: lp:~sergiusens/cupstream2distro-config/location-service_daily
Diff against target: 25 lines (+4/-3)
2 files modified
stacks/head/platform.cfg (+4/-0)
stacks/phablet/misc.cfg (+0/-3)
To merge this branch: bzr merge lp:~sergiusens/cupstream2distro-config/powerd_daily
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Francis Ginther Approve
Ken VanDine Approve
Review via email: mp+167111@code.launchpad.net

This proposal supersedes a proposal from 2013-06-03.

Commit message

Adding powerd to daily release

Description of the change

This is the first addition of this project into the daily release process... items on the branch may need to be moved to daily

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

FAILED: Continuous integration, rev:375
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/~sergiusens/cupstream2distro-config/powerd_daily/+merge/167111/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/270/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/68

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/270/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

powerd package only supports armhf, please also disable the amd64 build:

    powerd:
      configurations:
        raring-amd64: False
        raring-i386: False

review: Needs Fixing
Revision history for this message
Francis Ginther (fginther) wrote :

Also, these will need to be resolved with sil2100's pending branch.

376. By Sergio Schvezov

Updating to not build for amd64

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Needs to be synced with the pending branch: lp:~sil2100/cupstream2distro-config/switch_unity_and_deps_to_saucy

377. By Sergio Schvezov

Merging and adapting powerd from trunk merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/platform.cfg'
2--- stacks/head/platform.cfg 2013-06-03 19:52:14 +0000
3+++ stacks/head/platform.cfg 2013-06-03 20:02:26 +0000
4@@ -20,6 +20,10 @@
5 contact_email: martin.mrazik@canonical.com
6 use_description_for_commit: False
7 projects:
8+ powerd:
9+ configurations:
10+ saucy-i386: False
11+ saucy-amd64: False
12 platform-api:
13 qtubuntu:
14 hooks: D09add_ppa-phablet-team-ppa D08add_ppa-qt5-proper A10checklicenseheaders
15
16=== modified file 'stacks/phablet/misc.cfg'
17--- stacks/phablet/misc.cfg 2013-05-23 19:12:19 +0000
18+++ stacks/phablet/misc.cfg 2013-06-03 20:02:26 +0000
19@@ -25,6 +25,3 @@
20 target_branch: lp:phablet-extras/ofono-qt
21 gps-service:
22 session-manager:
23- powerd:
24- configurations:
25- raring-i386: False

Subscribers

People subscribed via source and target branches

to all changes: