diff -u lightdm-1.2.0/debian/changelog lightdm-1.2.0/debian/changelog --- lightdm-1.2.0/debian/changelog +++ lightdm-1.2.0/debian/changelog @@ -1,3 +1,10 @@ +lightdm (1.2.0-0ubuntu2) precise; urgency=low + + * Fix wrapper path in AppArmor profile. This got broken in 1.1.1. Patch also + committed upstream, and cherry-picked (r1487) (LP: #975901) + + -- Martin Pitt Tue, 10 Apr 2012 11:06:03 +0200 + lightdm (1.2.0-0ubuntu1) precise; urgency=low * New upstream release. only in patch2: unchanged: --- lightdm-1.2.0.orig/NEWS +++ lightdm-1.2.0/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 only in patch2: unchanged: --- lightdm-1.2.0.orig/data/guest-session.apparmor +++ lightdm-1.2.0/data/guest-session.apparmor @@ -4,7 +4,7 @@ #include -LIBEXECDIR/lightdm-guest-session-wrapper { +PKGLIBEXECDIR/lightdm-guest-session-wrapper { #include #include #include only in patch2: unchanged: --- lightdm-1.2.0.orig/data/Makefile.am +++ lightdm-1.2.0/data/Makefile.am @@ -12,7 +12,7 @@ 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