Light Display Manager

Merge lp:~jdstrand/lightdm/lightdm-1189948 into lp:lightdm

  1. lightdm-1189948
  2. Merge into trunk
Proposed by Jamie Strandboge
Status: Merged
Approved by: Robert Ancell
Approved revision: 1677
Merged at revision: 1677
Proposed branch: lp:~jdstrand/lightdm/lightdm-1189948
Merge into: lp:lightdm
Diff against target: 15 lines (+2/-2)
1 file modified
data/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~jdstrand/lightdm/lightdm-1189948
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+168796@code.launchpad.net

Commit message

install apparmor abstractions with proper permissions (LP: #1189948)

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

FAILED: Continuous integration, rev:1677
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/~jdstrand/lightdm/lightdm-1189948/+merge/168796/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/lightdm-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/51

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/57/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1677
http://jenkins.qa.ubuntu.com/job/lightdm-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/52

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/58/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2013-02-11 21:35:31 +0000
3+++ data/Makefile.am 2013-06-11 19:38:31 +0000
4@@ -22,9 +22,9 @@
5 sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \
6 > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session
7 install -d $(DESTDIR)$(apparmor_profiledir)/abstractions
8- install $(srcdir)/guest-session.apparmor_abstraction \
9+ install --mode=0644 $(srcdir)/guest-session.apparmor_abstraction \
10 $(DESTDIR)$(apparmor_profiledir)/abstractions/lightdm
11- install $(srcdir)/guest-session.apparmor_chromium_abstraction \
12+ install --mode=0644 $(srcdir)/guest-session.apparmor_chromium_abstraction \
13 $(DESTDIR)$(apparmor_profiledir)/abstractions/lightdm_chromium-browser
14
15 dist_man1_MANS = lightdm.1 \

Subscribers

People subscribed via source and target branches