[Pkg-acpi-devel] Bug#700696: [PATCH] Do not lock the screen in background while going to sleep

[Tormod Volden]

Otherwise the screen might be cleared and locked only after
the computer has woken up again.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700696

Signed-off-by: Tormod Volden <debian.tormod at gmail.com>
---
 debian/changelog                |    6 ++++++
 debian/patches/screenblank.diff |   20 +++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d303bc5..a10a6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+acpi-support (0.141-3) unstable; urgency=low
+
+  * Assure screen is locked before going to sleep (Closes: #700696) 
+
+ -- Tormod Volden <debian.tormod at gmail.com>  Sat, 16 Feb 2013 11:53:56 +0100
+
 acpi-support (0.141-2) unstable; urgency=low
 
   * Check for running screensavers before looking for installed ones.
diff --git a/debian/patches/screenblank.diff b/debian/patches/screenblank.diff
index 9025d11..c2ba1af 100644
--- a/debian/patches/screenblank.diff
+++ b/debian/patches/screenblank.diff
@@ -1,5 +1,7 @@
---- acpi-support-0.141/lib/screenblank
-+++ acpi-support-0.141/lib/screenblank
+Index: acpi-support/lib/screenblank
+===================================================================
+--- acpi-support.orig/lib/screenblank	2013-02-16 11:49:12.000000000 +0100
++++ acpi-support/lib/screenblank	2013-02-16 11:51:07.000000000 +0100
 @@ -1,13 +1,51 @@
 -if [ `pidof xscreensaver` ]; then
 -	su $user -c "(xscreensaver-command -throttle)"
@@ -12,16 +14,16 @@
 +    if [ x$XAUTHORITY != x ]; then
 +	export DISPLAY=:$displaynum
 +	if pidof xscreensaver >/dev/null; then
-+		su $XUSER -s /bin/sh -c "xscreensaver-command -throttle &"
++		su $XUSER -s /bin/sh -c "xscreensaver-command -throttle"
  	fi
 -elif [ `pidof dcopserver` ]; then
 -	dcop kdesktop KScreensaverIface lock
 -fi
 +	if [ x$LOCK_SCREEN = xtrue ]; then
 +		if pidof xscreensaver >/dev/null; then
-+			su $XUSER -s /bin/sh -c "xscreensaver-command -lock &"
++			su $XUSER -s /bin/sh -c "xscreensaver-command -lock"
 +		elif pidof gnome-screensaver > /dev/null; then
-+			su $XUSER -s /bin/sh -c "gnome-screensaver-command --lock &"
++			su $XUSER -s /bin/sh -c "gnome-screensaver-command --lock"
 +		elif pidof dcopserver >/dev/null; then
 +			avail_sessions=`dcop --all-users --list-sessions | grep '.DCOP.*__0'`
 +			# send the lock command to all sessions
@@ -32,15 +34,15 @@
 +		elif pidof xautolock >/dev/null;then
 +			su $XUSER -s /bin/sh -c "/usr/bin/xautolock -locknow"
 +		elif [ -x /usr/bin/xlock ]; then
-+			su $XUSER -s /bin/sh -c "/usr/bin/xlock -mode blank &"
++			su $XUSER -s /bin/sh -c "/usr/bin/xlock -mode blank"
 +		elif [ -x /usr/bin/xtrlock ]; then
-+			su $XUSER -s /bin/sh -c "/usr/bin/xtrlock &"
++			su $XUSER -s /bin/sh -c "/usr/bin/xtrlock"
 +	 	fi
 +	fi
 +
 +	case "$DISPLAY_DPMS" in
 +	  xset)
-+		su $XUSER -s /bin/sh -c "xset dpms force off &"
++		su $XUSER -s /bin/sh -c "xset dpms force off"
 +		;;
 +	  xrandr)
 +		su $XUSER -s /bin/sh -c "xrandr --output $XRANDR_OUTPUT --off"
@@ -60,6 +62,6 @@
 +    else
 +	if [ -x$DISPLAY_DPMS_NO_USER = xtrue ]; then
 +	    [ -x /usr/sbin/vbetool ] && /usr/sbin/vbetool dpms off
-+	fi 
++	fi
 +    fi
 +done
-- 
1.7.10.4