Merge lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241 into lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain
Proposed by
Jamie Strandboge
Status: | Merged |
---|---|
Approved by: | Jamie Strandboge |
Approved revision: | 1499 |
Merged at revision: | 1499 |
Proposed branch: | lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241 |
Merge into: | lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain |
Diff against target: |
80 lines (+21/-18) 6 files modified
debian/apparmor-notify.install (+1/-1) debian/apparmor-notify.maintscript (+1/-0) debian/changelog (+9/-1) debian/notify/90apparmor-notify (+0/-15) debian/notify/apparmor-notify.desktop (+9/-0) debian/notify/notify.conf (+1/-1) |
To merge this branch: | bzr merge lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marc Deslauriers | Approve | ||
Review via email: mp+212887@code.launchpad.net |
Description of the change
* autostart aa-notify via /etc/xdg/autostart instead of /etc/X11/Xsession.d
(LP: #1288241)
- remove debian/
- add debian/
- debian/
- add debian/
* debian/
"admin" (LP: #1009666)
To post a comment you must log in.
Looks good, ACK.