[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-74-g83c9b5c

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 75ab269d2ab40c11ea7bee605ba2c6685458fd0f
Author: Luca Niccoli <lultimouomo at gmail.com>
Date:   Fri Apr 23 17:15:34 2010 +0200

    Remove suspend support; it will be handled by acpi-support
    
    Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>

diff --git a/debian/eeepc-acpi-scripts.default.in b/debian/eeepc-acpi-scripts.default.in
index 5b0c832..17234f7 100644
--- a/debian/eeepc-acpi-scripts.default.in
+++ b/debian/eeepc-acpi-scripts.default.in
@@ -50,29 +50,6 @@ DETAILED_SOUND_INFO=no
 VGA_ON='--auto'
 LVDS_OFF='--off'
 
-# Use the specified suspend method, where the method is actually the name
-# of a command. Common methods:
-#   pm-suspend (default), pm-hibernate, pm-suspend-hybrid
-#   hibernate-ram, hibernate-disk
-#
-# s2ram and friends can also be specified, but it is usually better to run
-# them via a wrapper.
-# SUSPEND_OPTIONS is passed as is to the command.
-SUSPEND_METHOD=pm-suspend
-SUSPEND_OPTIONS=--quirk-s3-bios
-
-# Attempt to lock running xscreensaver or gnome-screensaver on suspend.
-# If you use hibernate(1), make sure you only indicate in one place to lock
-# the screen.
-LOCK_SCREEN_ON_SUSPEND='yes'
-
-# Action to perform when the lid is closed.
-# If left empty or set to "suspend", it will suspend via SUSPEND_METHOD
-# (specified above).
-# To do nothing, set it to "nothing".
-# Setting it to anything else will result in it being treated as a command.
-LID_CLOSE_ACTION=
-
 # Try to load/unload the hci_usb module and use hcitool for checking
 # bluetooth state when the bluetooth control node in
 # /sys/devices/platform/bluetooth is not present.
diff --git a/etc/acpi/actions/suspend.sh b/etc/acpi/actions/suspend.sh
deleted file mode 100755
index e80daab..0000000
--- a/etc/acpi/actions/suspend.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# do nothing if package is removed
-FUNC_LIB=/usr/share/eeepc-acpi-scripts/functions.sh
-[ -e "$FUNC_LIB" ] || exit 0
-
-. /etc/default/eeepc-acpi-scripts
-. $FUNC_LIB
-
-if (runlevel | grep -q [06]) || (pgrep -f -x -u root '/sbin/shutdown' > /dev/null); then
-    exit 0
-fi
-
-if [ "$LOCK_SCREEN_ON_SUSPEND" = "yes" ]; then
-    lock_x_screen
-fi
-
-# Setting defaults in case /etc/default/eeepc-acpi-scripts was not updated
-# Only set SUSPEND_OPTIONS if SUSPEND_METHOD is empty, because some methods
-# don't need/take any option.
-if [ -z "$SUSPEND_METHOD" ]; then
-    SUSPEND_OPTIONS=--quirk-s3-bios
-fi
-if [ -z "$(which "$SUSPEND_METHOD")" ]; then
-    SUSPEND_METHOD=pm-suspend
-fi
-
-$SUSPEND_METHOD $SUSPEND_OPTIONS

-- 
Maintenance of eeepc-acpi-scripts debian package