From e8deb9e412a4a6b8c1a0ffe075f6e26c65687cdb Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 10 Apr 2012 10:01:49 +0200 Subject: [PATCH] Fix wrapper path in AppArmor profile (broken since 1.1.1) r1358 broke this by moving the wrapper into pkglibexecdir. --- NEWS | 4 ++++ data/Makefile.am | 2 +- data/guest-session.apparmor | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f2913740..6e0f7bc3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Overview of changes in lightdm 1.2.1 + + * Fix wrapper path in AppArmor profile (broken since 1.1.1) + Overview of changes in lightdm 1.2.0 * Backup .xsession-errors on login diff --git a/data/Makefile.am b/data/Makefile.am index 590dd242..376e2f13 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,7 +12,7 @@ apparmor_profiledir = $(sysconfdir)/apparmor.d install-data-hook: install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ + sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \ > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session dist_man1_MANS = lightdm.1 diff --git a/data/guest-session.apparmor b/data/guest-session.apparmor index cf90d5f1..60b622f3 100644 --- a/data/guest-session.apparmor +++ b/data/guest-session.apparmor @@ -4,7 +4,7 @@ #include -LIBEXECDIR/lightdm-guest-session-wrapper { +PKGLIBEXECDIR/lightdm-guest-session-wrapper { #include #include #include -- 2.39.2