Rename the guest session wrapper to have a simpler name

diff --git a/.bzrignore b/.bzrignore
index 8c735385a1095032b17843dbbd38bb475de6bdd0..5acfce47105269418ac6ac0cd878e3f16cffc04c 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -58,7 +58,7 @@ src/user-manager-glue.h
 src/ldm-marshal.c
 src/ldm-marshal.h
 src/lightdm
-src/lightdm-guest-session-wrapper
+src/lightdm-guest-session
 tests/*.log
 tests/*.trs
 tests/data/passwd

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 62ed09de806f61b2e8cefd85038b1485fd4caf18..95230ab4f665749d99263cdd0f1e57fe634b7dbb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,11 +93,11 @@ lightdm_LDADD = \
        -lgcrypt \
        -lpam
 
-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