← Back to team overview

xubuntu-dev team mailing list archive

[Merge] lp:~smd-seandavis/xubuntu-default-settings/light-locker-live into lp:xubuntu-default-settings

 

Sean Davis has proposed merging lp:~smd-seandavis/xubuntu-default-settings/light-locker-live into lp:xubuntu-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)

For more details, see:
https://code.launchpad.net/~smd-seandavis/xubuntu-default-settings/light-locker-live/+merge/207087

Please see https://bugs.launchpad.net/ubuntu/+source/light-locker/+bug/1281323 for reference.

Light Locker is installed and autostarts with each session.  In the live session, this means that after 10 minutes, the session will be locked and at the login screen.  This patch (courtesy of Unit193) prevents the autostart by adding overriding the autostart entry in xubuntu-live-settings.

xubuntu-default-settings (14.04.1) UNRELEASED; urgency=medium

  * debian/xubuntu-live-settings.install
  * debian/light-locker.desktop
    - Prevent autostart of light-locker in live session (see LP: #1281323)

 -- Sean Davis <smd.seandavis@xxxxxxxxx>  Tue, 18 Feb 2014 22:42:17 -0500
-- 
https://code.launchpad.net/~smd-seandavis/xubuntu-default-settings/light-locker-live/+merge/207087
Your team Xubuntu Developers is requested to review the proposed merge of lp:~smd-seandavis/xubuntu-default-settings/light-locker-live into lp:xubuntu-default-settings.
=== modified file 'debian/changelog'
--- debian/changelog	2014-01-15 12:50:12 +0000
+++ debian/changelog	2014-02-19 03:49:47 +0000
@@ -1,3 +1,11 @@
+xubuntu-default-settings (14.04.1) UNRELEASED; urgency=medium
+
+  * debian/xubuntu-live-settings.install
+  * debian/light-locker.desktop
+    - Prevent autostart of light-locker in live session (see LP: #1281323)
+
+ -- Sean Davis <smd.seandavis@xxxxxxxxx>  Tue, 18 Feb 2014 22:42:17 -0500
+
 xubuntu-default-settings (14.04.0) trusty; urgency=low
 
   * Automated translations updates

=== added file 'debian/light-locker.desktop'
--- debian/light-locker.desktop	1970-01-01 00:00:00 +0000
+++ debian/light-locker.desktop	2014-02-19 03:49:47 +0000
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=True
\ No newline at end of file

=== modified file 'debian/xubuntu-live-settings.install'
--- debian/xubuntu-live-settings.install	2011-11-19 19:05:13 +0000
+++ debian/xubuntu-live-settings.install	2014-02-19 03:49:47 +0000
@@ -1,1 +1,2 @@
 casper/* usr/share/initramfs-tools/scripts/casper-bottom/
+debian/light-locker.desktop  etc/xdg/xdg-xubuntu/autostart/
\ No newline at end of file


Follow ups