AppArmor

Merge lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241 into lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain

  1. apparmor-ubuntu-citrain.lp1288241
  2. Merge into apparmor-ubuntu-citrain
Proposed by Jamie Strandboge
Status: Merged
Approved by: Jamie Strandboge
Approved revision: 1499
Merged at revision: 1499
Proposed branch: lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241
Merge into: lp://qastaging/~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://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1288241
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Review via email: mp+212887@code.qastaging.launchpad.net

Description of the change

  * autostart aa-notify via /etc/xdg/autostart instead of /etc/X11/Xsession.d
    (LP: #1288241)
    - remove debian/notify/90apparmor-notify
    - add debian/notify/apparmor-notify.desktop
    - debian/apparmor-notify.install: adjust for the above
    - add debian/apparmor-notify.maintscript to remove 90apparmor-notify
  * debian/notify/notify.conf: use_group should be set to "sudo" instead of
    "admin" (LP: #1009666)

To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good, ACK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: