Merge lp://staging/~jdstrand/powerd/powerd-lp1296415 into lp://staging/powerd
Status: | Rejected |
---|---|
Rejected by: | Jamie Strandboge |
Proposed branch: | lp://staging/~jdstrand/powerd/powerd-lp1296415 |
Merge into: | lp://staging/powerd |
Diff against target: |
70 lines (+27/-0) 6 files modified
debian/control (+1/-0) debian/dirs (+1/-0) debian/install (+1/-0) debian/rules (+4/-0) debian/upstart (+4/-0) debian/usr.bin.powerd (+16/-0) |
To merge this branch: | bzr merge lp://staging/~jdstrand/powerd/powerd-lp1296415 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+224366@code.staging.launchpad.net |
Commit message
* add lenient AppArmor profile to allow connecting to ofono (LP: #1296415)
- add debian/
- debian/control: Build-Depends on dh-apparmor
- debian/rules: update override_
- debian/powerd.dirs: add etc/apparmor.d
- debian/
- debian/upstart: update to load the AppArmor profile
Description of the change
* add lenient AppArmor profile to allow connecting to ofono (LP: #1296415)
- add debian/
- debian/control: Build-Depends on dh-apparmor
- debian/rules: update override_
- debian/powerd.dirs: add etc/apparmor.d
- debian/
- debian/upstart: update to load the AppArmor profile
Unmerged revisions
- 133. By Jamie Strandboge
-
debian/
usr.bin. powerd: more closely mimic confined with exec transitions - 132. By Jamie Strandboge
-
revert change to debian/changelog-- let autolanding handle it
- 131. By Jamie Strandboge
-
* add lenient AppArmor profile to allow connecting to ofono (LP: #1296415)
- add debian/usr.bin. powerd
- debian/control: Build-Depends on dh-apparmor
- debian/rules: update override_dh_installdeb to use dh_apparmor
- debian/powerd.dirs: add etc/apparmor.d
- debian/powerd. install: install profile in to place
- debian/upstart: update to load the AppArmor profile
PASSED: Continuous integration, rev:132 jenkins. qa.ubuntu. com/job/ powerd- ci/156/ jenkins. qa.ubuntu. com/job/ powerd- utopic- armhf-ci/ 8 jenkins. qa.ubuntu. com/job/ powerd- utopic- armhf-ci/ 8/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/powerd- ci/156/ rebuild
http://