From 77d91fea258e19bd39a8d19cb5bfa265868f23a1 Mon Sep 17 00:00:00 2001
From: apt-ghetto <apt-ghetto@lubuntu.me>
Date: Sat, 27 Jul 2019 18:26:58 -0500
Subject: [PATCH] Set default lock to light-locker-command

Summary:
Instead of lxlock, which is not part of 18.04/18.04.1, set default lock to light-locker-command.

  * Depend on light-locker
  * Replace lxlock with light-locker-command -l
  * Added changelog entry

Test Plan:
1. Boot Lubuntu 18.04/18.04.1
2. Login
3. Delete ~/.config/lxsession/Lubuntu/desktop.conf
4. Logout
5. Login
6. Press CTRL-ALT-L

Reviewers: wxl, tsimonq2

Reviewed By: wxl, tsimonq2

Maniphest Tasks: T90

Differential Revision: https://phab.lubuntu.me/D23
---
 debian/changelog                                         | 7 +++++++
 src/etc/xdg/lxsession/Lubuntu/desktop.conf               | 2 ++
 src/usr/share/applications/lubuntu-screenlock.desktop.in | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0b5a88b..b4a6282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lubuntu-default-settings (0.54.3) bionic; urgency=medium
+
+  * Set the default lock to light-locker-command instead of lxlock
+    (LP: #1812594)
+
+ -- apt-ghetto <apt-ghetto@lubuntu.me>  Thu, 25 Jul 2019 10:21:00 +0200
+
 lubuntu-default-settings (0.54.2) bionic; urgency=medium
 
   * Remove /usr/share/xsessions/QLubuntu.desktop from
diff --git a/src/etc/xdg/lxsession/Lubuntu/desktop.conf b/src/etc/xdg/lxsession/Lubuntu/desktop.conf
index 40bfcc2..14ed668 100644
--- a/src/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/src/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -55,6 +55,8 @@ im1/autostart=
 
 webcam/command=guvcview
 
+lock_manager/command=light-locker-command -l
+
 [State]
 laptop_mode=unknown
 
diff --git a/src/usr/share/applications/lubuntu-screenlock.desktop.in b/src/usr/share/applications/lubuntu-screenlock.desktop.in
index b85c1f1..d8a68d0 100644
--- a/src/usr/share/applications/lubuntu-screenlock.desktop.in
+++ b/src/usr/share/applications/lubuntu-screenlock.desktop.in
@@ -2,6 +2,6 @@
 _Name=ScreenLock
 _Comment=Lock your screen
 Icon=system-lock-screen
-Exec=lxlock
+Exec=light-locker-command -l
 NoDisplay=true
 Type=Application