summarylogtreecommitdiffstats
path: root/lightdm-pantheon-greeter-paths.patch
diff options
context:
space:
mode:
Diffstat (limited to 'lightdm-pantheon-greeter-paths.patch')
-rw-r--r--lightdm-pantheon-greeter-paths.patch103
1 files changed, 103 insertions, 0 deletions
diff --git a/lightdm-pantheon-greeter-paths.patch b/lightdm-pantheon-greeter-paths.patch
new file mode 100644
index 000000000000..bf17f2e066c4
--- /dev/null
+++ b/lightdm-pantheon-greeter-paths.patch
@@ -0,0 +1,103 @@
+diff -rupN lightdm-pantheon-greeter/CMakeLists.txt lightdm-pantheon-greeter.new/CMakeLists.txt
+--- lightdm-pantheon-greeter/CMakeLists.txt 2016-11-17 10:15:21.079847000 +0100
++++ lightdm-pantheon-greeter.new/CMakeLists.txt 2016-11-17 10:14:22.832088457 +0100
+@@ -8,7 +8,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_S
+
+ set (CONF_DIR "/etc/lightdm")
+ set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+-set (PKGDATADIR "${DATADIR}/pantheon-greeter")
++set (PKGDATADIR "${DATADIR}/lightdm-pantheon-greeter")
+ set (CMAKE_INSTALL_PREFIX /usr)
+ set (VERSION "3.0.0")
+
+@@ -61,10 +61,10 @@ add_subdirectory (po)
+
+ include (GSettings)
+
+-add_executable (pantheon-greeter ${VALA_C})
+-target_link_libraries(pantheon-greeter m)
++add_executable (lightdm-pantheon-greeter ${VALA_C})
++target_link_libraries(lightdm-pantheon-greeter m)
+
+-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
+-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
+-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.conf DESTINATION ${CONF_DIR})
++install (TARGETS lightdm-pantheon-greeter RUNTIME DESTINATION bin)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.desktop DESTINATION share/xgreeters)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.conf DESTINATION ${CONF_DIR})
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
+diff -rupN lightdm-pantheon-greeter/data/lightdm-pantheon-greeter.conf lightdm-pantheon-greeter.new/data/lightdm-pantheon-greeter.conf
+--- lightdm-pantheon-greeter/data/lightdm-pantheon-greeter.conf 1970-01-01 01:00:00.000000000 +0100
++++ lightdm-pantheon-greeter.new/data/lightdm-pantheon-greeter.conf 2016-11-17 10:11:53.252671426 +0100
+@@ -0,0 +1,6 @@
++[greeter]
++#activate-numlock=true
++#default-wallpaper=/usr/share/backgrounds/elementaryos-default
++#high-contrast=false
++#onscreen-keyboard=false
++#screensaver-timeout=60
+diff -rupN lightdm-pantheon-greeter/data/lightdm-pantheon-greeter.desktop lightdm-pantheon-greeter.new/data/lightdm-pantheon-greeter.desktop
+--- lightdm-pantheon-greeter/data/lightdm-pantheon-greeter.desktop 1970-01-01 01:00:00.000000000 +0100
++++ lightdm-pantheon-greeter.new/data/lightdm-pantheon-greeter.desktop 2016-11-17 10:11:53.252671426 +0100
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++Name=Pantheon Greeter
++Comment=Pantheon Greeter
++Exec=lightdm-pantheon-greeter
++Type=Application
++X-Ubuntu-Gettext-Domain=pantheon-greeter
++Name[en_US]=lightdm-pantheon-greeter
+diff -rupN lightdm-pantheon-greeter/data/pantheon-greeter.conf lightdm-pantheon-greeter.new/data/pantheon-greeter.conf
+--- lightdm-pantheon-greeter/data/pantheon-greeter.conf 2016-11-17 10:15:21.079847000 +0100
++++ lightdm-pantheon-greeter.new/data/pantheon-greeter.conf 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[greeter]
+-#activate-numlock=true
+-#default-wallpaper=/usr/share/backgrounds/elementaryos-default
+-#high-contrast=false
+-#onscreen-keyboard=false
+-#screensaver-timeout=60
+diff -rupN lightdm-pantheon-greeter/data/pantheon-greeter.desktop lightdm-pantheon-greeter.new/data/pantheon-greeter.desktop
+--- lightdm-pantheon-greeter/data/pantheon-greeter.desktop 2016-11-17 10:15:21.079847000 +0100
++++ lightdm-pantheon-greeter.new/data/pantheon-greeter.desktop 1970-01-01 01:00:00.000000000 +0100
+@@ -1,7 +0,0 @@
+-[Desktop Entry]
+-Name=Pantheon Greeter
+-Comment=Pantheon Greeter
+-Exec=pantheon-greeter
+-Type=Application
+-X-Ubuntu-Gettext-Domain=pantheon-greeter
+-Name[en_US]=pantheon-greeter
+diff -rupN lightdm-pantheon-greeter/src/PantheonGreeter.vala lightdm-pantheon-greeter.new/src/PantheonGreeter.vala
+--- lightdm-pantheon-greeter/src/PantheonGreeter.vala 2016-11-17 10:15:21.079847000 +0100
++++ lightdm-pantheon-greeter.new/src/PantheonGreeter.vala 2016-11-17 10:11:53.252671426 +0100
+@@ -104,7 +104,7 @@ public class PantheonGreeter : Gtk.Windo
+
+ settings = new KeyFile ();
+ try {
+- settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
++ settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "lightdm-pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
+ } catch (Error e) {
+ warning (e.message);
+ }
+@@ -433,7 +433,7 @@ public class PantheonGreeter : Gtk.Windo
+ }
+
+ public static int main (string [] args) {
+- message ("Starting pantheon-greeter...");
++ message ("Starting lightdm-pantheon-greeter...");
+ /* Protect memory from being paged to disk, as we deal with passwords */
+ Posix.mlockall (Posix.MCL_CURRENT | Posix.MCL_FUTURE);
+
+diff -rupN lightdm-pantheon-greeter/src/Wallpaper.vala lightdm-pantheon-greeter.new/src/Wallpaper.vala
+--- lightdm-pantheon-greeter/src/Wallpaper.vala 2016-11-17 10:15:21.079847000 +0100
++++ lightdm-pantheon-greeter.new/src/Wallpaper.vala 2016-11-17 10:11:53.252671426 +0100
+@@ -53,7 +53,7 @@ public class Wallpaper : GtkClutter.Acto
+ var settings = new KeyFile ();
+ string default_wallpaper = "/usr/share/backgrounds/elementaryos-default";
+ try {
+- settings.load_from_file (Constants.CONF_DIR + "/pantheon-greeter.conf", KeyFileFlags.KEEP_COMMENTS);
++ settings.load_from_file (Constants.CONF_DIR + "/lightdm-pantheon-greeter.conf", KeyFileFlags.KEEP_COMMENTS);
+ default_wallpaper = settings.get_string ("greeter", "default-wallpaper");
+ } catch (Error e) {
+ warning (e.message);