From 361c0cd144dff483986e9bd1488fc1f9a040ca2b Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Thu, 7 Nov 2013 21:45:27 +1300
Subject: [PATCH] Rename the guest session wrapper to have a simpler name

---
 .bzrignore                                                  | 2 +-
 data/apparmor/lightdm-guest-session.in                      | 2 +-
 debian/50-guest-wrapper.conf                                | 2 +-
 src/Makefile.am                                             | 6 +++---
 ...htdm-guest-session-wrapper.c => lightdm-guest-session.c} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{lightdm-guest-session-wrapper.c => lightdm-guest-session.c} (100%)

diff --git a/.bzrignore b/.bzrignore
index 8c735385..5acfce47 100644
--- 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 937a75d9..728bebaa 100644
--- 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 a566e7d8..66b56875 100644
--- 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 62ed09de..95230ab4 100644
--- 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
-- 
2.39.2