Merge lp:~noskcaj/ubuntu/trusty/xfce4-session/light-locker into lp:ubuntu/trusty/xfce4-session

[Jackson Doak]

Add light locker support

[Daniel Holbach (dholbach)]

The patch looks good, can it be forward to the upstream developers please?

[Jackson Doak (noskcaj)]

They're working on it.

On Thu, Dec 19, 2013 at 1:40 AM, Daniel Holbach
<email address hidden>wrote:

> The patch looks good, can it be forward to the upstream developers please?
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/xfce4-session/light-locker/+merge/196436
> You are the owner of lp:~noskcaj/ubuntu/trusty/xfce4-session/light-locker.
>

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-10-23 21:13:30 +0000
+++ .pc/applied-patches	2013-11-24 02:58:07 +0000
@@ -2,3 +2,4 @@
 xubuntu_ignore-gdm-lang.patch
 xubuntu_set-xdg-current-desktop.patch
 xubuntu_runtime-logind-support.patch
+xflock4-light-locker-support.patch

=== added directory '.pc/xflock4-light-locker-support.patch'
=== added file '.pc/xflock4-light-locker-support.patch/.timestamp'
=== added directory '.pc/xflock4-light-locker-support.patch/scripts'
=== added file '.pc/xflock4-light-locker-support.patch/scripts/xflock4'
--- .pc/xflock4-light-locker-support.patch/scripts/xflock4	1970-01-01 00:00:00 +0000
+++ .pc/xflock4-light-locker-support.patch/scripts/xflock4	2013-11-24 02:58:07 +0000
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+#  xfce4
+#
+#  Copyright (C) 1999, 2003 Olivier Fourdan ([e-mail])
+#  Copyright (C) 2011       Guido Berhoerster ([e-mail])
+#  Copyright (C) 2011       Jarno Suni ([e-mail])
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+PATH=/bin:/usr/bin
+export PATH
+
+# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+for lock_cmd in \
+    "xscreensaver-command -lock" \
+    "gnome-screensaver-command --lock"
+do
+    $lock_cmd >/dev/null 2>&1 && exit
+done
+
+# else run another access locking utility, if installed
+for lock_cmd in \
+  "xlock -mode blank" \
+  "slock"
+  do
+    set -- $lock_cmd
+    if command -v -- $1 >/dev/null 2>&1; then
+        $lock_cmd >/dev/null 2>&1 &
+	# turn off display backlight:
+	xset dpms force off
+        exit
+    fi
+done
+
+# else access locking failed
+exit 1

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-12 21:41:29 +0000
+++ debian/changelog	2013-11-24 02:58:07 +0000
@@ -1,3 +1,9 @@
+xfce4-session (4.10.1-3ubuntu3) trusty; urgency=low
+
+  * Add xflock4-light-locker-support.patch. LP: #1254366
+
+ -- Jackson Doak <[e-mail]>  Sun, 24 Nov 2013 13:43:52 +1100
+
 xfce4-session (4.10.1-3ubuntu2) trusty; urgency=low
 
   * Add mythbuntu to the list of xsessions to be potentially ran by upstart.

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-23 21:13:30 +0000
+++ debian/patches/series	2013-11-24 02:58:07 +0000
@@ -2,3 +2,4 @@
 xubuntu_ignore-gdm-lang.patch
 xubuntu_set-xdg-current-desktop.patch
 xubuntu_runtime-logind-support.patch
+xflock4-light-locker-support.patch

=== added file 'debian/patches/xflock4-light-locker-support.patch'
--- debian/patches/xflock4-light-locker-support.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/xflock4-light-locker-support.patch	2013-11-24 02:58:07 +0000
@@ -0,0 +1,22 @@
+Add support for locking via light-locker to xflock4
+
+---
+ scripts/xflock4 |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/scripts/xflock4
++++ b/scripts/xflock4
+@@ -24,10 +24,11 @@
+ PATH=/bin:/usr/bin
+ export PATH
+ 
+-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
++# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running
+ for lock_cmd in \
+     "xscreensaver-command -lock" \
+-    "gnome-screensaver-command --lock"
++    "gnome-screensaver-command --lock" \
++    "light-locker-command -l"
+ do
+     $lock_cmd >/dev/null 2>&1 && exit
+ done

=== modified file 'scripts/xflock4'
--- scripts/xflock4	2012-04-15 16:00:33 +0000
+++ scripts/xflock4	2013-11-24 02:58:07 +0000
@@ -24,10 +24,11 @@
 PATH=/bin:/usr/bin
 export PATH
 
-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running
 for lock_cmd in \
     "xscreensaver-command -lock" \
-    "gnome-screensaver-command --lock"
+    "gnome-screensaver-command --lock" \
+    "light-locker-command -l"
 do
     $lock_cmd >/dev/null 2>&1 && exit
 done