Merge lp://staging/~ted/apparmor-easyprof-ubuntu/vivid-ual-mir-helper into lp://staging/apparmor-easyprof-ubuntu
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~ted/apparmor-easyprof-ubuntu/vivid-ual-mir-helper |
| Merge into: | lp://staging/apparmor-easyprof-ubuntu |
| Diff against target: |
239 lines (+99/-8) (has conflicts) 12 files modified
data/policygroups/ubuntu/1.3/bluetooth (+27/-0) data/policygroups/ubuntu/1.3/in-app-purchases (+7/-0) data/templates/ubuntu/1.0/ubuntu-sdk (+1/-1) data/templates/ubuntu/1.0/ubuntu-webapp (+1/-1) data/templates/ubuntu/1.1/ubuntu-sdk (+1/-1) data/templates/ubuntu/1.1/ubuntu-webapp (+1/-1) data/templates/ubuntu/1.2/ubuntu-account-plugin (+1/-1) data/templates/ubuntu/1.2/ubuntu-scope-network (+1/-1) data/templates/ubuntu/1.3/ubuntu-sdk (+1/-1) debian/changelog (+50/-0) debian/tests/installed-policy-groups (+7/-0) pending/templates/ubuntu-scope-local-content (+1/-1) Conflict adding file data/policygroups/ubuntu/1.3/bluetooth. Moved existing file to data/policygroups/ubuntu/1.3/bluetooth.moved. Conflict adding file data/policygroups/ubuntu/1.3/in-app-purchases. Moved existing file to data/policygroups/ubuntu/1.3/in-app-purchases.moved. Text conflict in debian/changelog Text conflict in debian/tests/installed-policy-groups |
| To merge this branch: | bzr merge lp://staging/~ted/apparmor-easyprof-ubuntu/vivid-ual-mir-helper |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Security Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-08-22.
Commit message
Backport UAL Mir socket helper stanzas
Unmerged revisions
- 35. By Ted Gould
-
Add UAL socket demangler stanzas
- 34. By Jamie Strandboge
-
[ Simon Fels ]
Allow libhybris to load its linker implementation at runtime - 33. By Jamie Strandboge
-
add back the history changes:
[ Tiago Salem Herrmann ]
ubuntu/history: add owner read access to
@{HOME}/.local/ share/history- service/ attachments/ - 32. By Jamie Strandboge
-
add reserved ubuntu/bluetooth (LP: #1569582)
- 31. By Jamie Strandboge
-
reviert r30-- will apply on top of 1.3.17 commits
- 30. By Jamie Strandboge
-
[ Tiago Salem Herrmann ]
ubuntu/history: add owner read access to
@{HOME}/.local/ share/history- service/ attachments/ - 29. By Jamie Strandboge
-
revert recent history change since it was dropped in 1.3.16
- 28. By Jamie Strandboge
-
[ Jamie Strandboge ]
ubuntu/unconfined: remove autopilot specific rules and use simpler
'/*pix,' rule. This is possible because dbus-property-service no longer
ships 'fakeenv' rules. This is only backportable on earlier releases if
dbus-property-service in those releases has the same change.
(LP: #1464341) - 27. By Jamie Strandboge
-
[ Tiago Salem Herrmann ]
* ubuntu/history: add owner read access to
@{HOME}/.local/ share/history- service/ attachments/ - 26. By Jamie Strandboge
-
[ Alberto Mardegan ]
* ubuntu/1.[23]/ accounts: add the new Online Accounts v2 API (LP: #1512667)
[ Jamie Strandboge ]
* ubuntu/ubuntu- webapp: allow read access to /usr/share/ ubuntu- html5-theme
and /usr/share/ubuntu- html5-ui- toolkit (LP: #1477580)
