Merge with trunk

diff --git a/.bzrignore b/.bzrignore
index 26b5628a964045ea9fdd4c30279a55bf08e8c33d..0f66e00313026f9b699f081e305b36304be6a078 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -53,7 +53,7 @@ po/POTFILES
 po/stamp-it
 src/dm-tool
 src/lightdm
-src/lightdm-guest-session-wrapper
+src/lightdm-guest-session
 tests/*.log
 tests/*.trs
 tests/data/passwd

diff --git a/data/Makefile.am b/data/Makefile.am
index 69fd1d2be320f8c138bc3e498054cfadeb6727c4..b5601b940a0c432e5c322912e1cfdd4a65aa4211 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@ dist_pam_DATA = pam/lightdm \
                 pam/lightdm-greeter
 
 lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in
-       sed -e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' $< >$@
+       sed -e 's|@libexecdir[@]|$(libexecdir)|g' $< >$@
 
 apparmor_profiledir = $(sysconfdir)/apparmor.d
 apparmor_profile_DATA = \

diff --git a/data/apparmor/lightdm-guest-session.in b/data/apparmor/lightdm-guest-session.in
index 937a75d9d91a46e27031d6d745872ed738a16b35..728bebaaf309a65f5b3be484250511918f2dbdb7 100644 (file)
--- a/data/apparmor/lightdm-guest-session.in
+++ b/data/apparmor/lightdm-guest-session.in
@@ -3,7 +3,7 @@
 
 #include <tunables/global>
 
-@pkglibexecdir@/lightdm-guest-session-wrapper {
+@libexecdir@/lightdm-guest-session {
   # Most applications are confined via the main abstraction
   #include <abstractions/lightdm>
 

diff --git a/debian/50-guest-wrapper.conf b/debian/50-guest-wrapper.conf
index a566e7d85a926657189af553754dbd088a43c4cf..66b56875255245abdcc2915aa343b8078b6aa639 100644 (file)
--- a/debian/50-guest-wrapper.conf
+++ b/debian/50-guest-wrapper.conf
@@ -1,2 +1,2 @@
 [SeatDefaults]
-guest-wrapper=/usr/lib/lightdm/lightdm/lightdm-guest-session-wrapper
+guest-wrapper=/usr/lib/lightdm/lightdm-guest-session

diff --git a/src/Makefile.am b/src/Makefile.am
index c2237f696a882c99f506339288dc536557ec85d8..0ff571fb96c7e5170da64de0d4875eb6e4492ed2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,11 +104,11 @@ dm_tool_CFLAGS = \
 dm_tool_LDADD = \
        $(LIGHTDM_LIBS)
 
-pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
+libexec_PROGRAMS = lightdm-guest-session
 
-lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
+lightdm_guest_session_SOURCES = lightdm-guest-session.c
 
-lightdm_guest_session_wrapper_CFLAGS = \
+lightdm_guest_session_CFLAGS = \
        $(LIGHTDM_CFLAGS) \
        $(WARN_CFLAGS)
 

diff --git a/src/lightdm-guest-session-wrapper.c b/src/lightdm-guest-session.c
similarity index 100%
rename from src/lightdm-guest-session-wrapper.c
rename to src/lightdm-guest-session.c