commit powersave

5 Apr 2006

Hello community,

here is the log from the commit of package powersave
checked in at Wed Apr 5 17:39:25 CEST 2006.

--------

--- powersave/powersave.changes	2006-03-28 16:23:39.000000000 +0200
+++ powersave/powersave.changes	2006-04-05 12:17:19.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr  5 12:13:18 CEST 2006 - hmacht@suse.de
+
+- show graphical message if suspend to RAM works, but not with
+  framebuffer
+- update contribution script for asus hotkeys
+- prevent segfault after reading out available frequencies
+
+-------------------------------------------------------------------

Old:
----
  powersave-0.12.9.tar.bz2

New:
----
  powersave-0.12.10.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ powersave.spec ++++++
--- /var/tmp/diff_new_pack.z5ierY/_old	2006-04-05 17:39:09.000000000 +0200
+++ /var/tmp/diff_new_pack.z5ierY/_new	2006-04-05 17:39:09.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package powersave (Version 0.12.9)
+# spec file for package powersave (Version 0.12.10)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -14,7 +14,7 @@
 BuildRequires:  cpufrequtils gcc-c++ hal-devel lynx
 URL:            http://powersave.sourceforge.net/
 Summary:        General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling
-Version:        0.12.9
+Version:        0.12.10
 Release:        1
 License:        GPL
 Group:          System/Daemons
@@ -171,6 +171,11 @@
 %_libdir/lib*.so*
 
 %changelog -n powersave
+* Wed Apr 05 2006 - hmacht@suse.de
+- show graphical message if suspend to RAM works, but not with
+  framebuffer
+- update contribution script for asus hotkeys
+- prevent segfault after reading out available frequencies
 * Tue Mar 28 2006 - hmacht@suse.de
 - reset cpufreq governor after resume (bug 161220)
 - don't try to write up_threshold when switching schemes

++++++ powersave-0.12.9.tar.bz2 -> powersave-0.12.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/INSTALL new/powersave-0.12.10/INSTALL
--- old/powersave-0.12.9/INSTALL	2006-03-27 18:40:43.000000000 +0200
+++ new/powersave-0.12.10/INSTALL	2006-04-05 10:32:36.000000000 +0200
@@ -1,236 +1,61 @@
-Installation Instructions
-*************************
+	@section Get the Sources
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+	@subsection Get the Tarball
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+	You can download CVS HEAD tarballs via the CVSweb frontend:
 
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+	powersave: @uref{http://forge.novell.com/modules/xfmod/cvs/cvsbrowse.php/powersave/powersave/powersave.tar.gz?tarball=1&only_with_tag=HEAD}
 
+	The clients can be found here: @*
+	kpowersave: @uref{http://forge.novell.com/modules/xfmod/cvs/cvsbrowse.php/powersave/kpowersave/kpowersave.tar.gz?tarball=1&only_with_tag=HEAD}
+	wmpowersave: @uref{http://forge.novell.com/modules/xfmod/cvs/cvsbrowse.php/powersave/wmpowersave/wmpowersave.tar.gz?tarball=1&only_with_tag=HEAD}
+
+	@subsection Get the CVS Sources
+
+	export CVS_RSH=ssh 
+	cvs -z3 -d:ext:anonymous@@forgecvs1.novell.com:/cvsroot/powersave co modulename 
+  
+	The module you wish to check out must be specified as modulename 
+	(either 'powersave', 'kpowersave' or 'wmpowersave'). 
+	When prompted for the password, simply enter "anonymous". 
+  
+	We'll try to let HEAD stay in good shape all the time but well, 
+	you never know. Tell us if you find bugs or have problems compiling.
+
+	@section Compiling  
+
+	In the powersave directory do:
+	@enumerate
+
+	@item  
+	autoreconf -fi
+	./configure --prefix=/usr
+
+	(./configure --help gives further instructions (recommended))
+
+	@item
+	If no error occures type "make"
+	
+	@item
+	change the user to root (su root) and type "make install"
+	@end enumerate
+
+	@section Needed Packages for Compiling
+
+	This list is probably not complete, but gives an overview:
+
+	@itemize
+	@item
+		libstd-c++
+	@item
+		g++
+	@item
+		autoconf
+	@item
+		automake
+	@item
+		libtool
+	@item
+		@dots{}
+	@end itemize
+		
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/config_files/sleep new/powersave-0.12.10/config_files/sleep
--- old/powersave-0.12.9/config_files/sleep	2006-03-27 20:04:51.000000000 +0200
+++ new/powersave-0.12.10/config_files/sleep	2006-04-03 23:00:00.000000000 +0200
@@ -26,7 +26,7 @@
 
 ## Path:        	System/Powermanagement/Powersave/Sleep_Modes
 ### Type:        	string
-## Default:     	"usb_storage sbp2 ohci_hcd uhci_hcd stir4200 ohci1394 ipw22200 rt2500 prism54 ath_pci r8169 lt_modem Intel536 Intel537"
+## Default:     	"usb_storage sbp2 ohci_hcd uhci_hcd stir4200 ohci1394 ipw2200 rt2500 prism54 ath_pci r8169 lt_modem Intel536 Intel537"
 ## ServiceRestart: 	
 #
 # These modules will be unloaded before entering the corresponding
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/configure new/powersave-0.12.10/configure
--- old/powersave-0.12.9/configure	2006-03-28 16:28:32.000000000 +0200
+++ new/powersave-0.12.10/configure	2006-04-05 12:10:45.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for powersave 0.12.9.
+# Generated by GNU Autoconf 2.59 for powersave 0.12.10.
 #
 # Report bugs to <hmacht@suse.de>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='powersave'
 PACKAGE_TARNAME='powersave'
-PACKAGE_VERSION='0.12.9'
-PACKAGE_STRING='powersave 0.12.9'
+PACKAGE_VERSION='0.12.10'
+PACKAGE_STRING='powersave 0.12.10'
 PACKAGE_BUGREPORT='hmacht@suse.de'
 
 ac_unique_file="daemon/powersaved.cpp"
@@ -982,7 +982,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures powersave 0.12.9 to adapt to many kinds of systems.
+\`configure' configures powersave 0.12.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1048,7 +1048,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of powersave 0.12.9:";;
+     short | recursive ) echo "Configuration of powersave 0.12.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1209,7 +1209,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-powersave configure 0.12.9
+powersave configure 0.12.10
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1223,7 +1223,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by powersave $as_me 0.12.9, which was
+It was created by powersave $as_me 0.12.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1866,7 +1866,7 @@
 
 # Define the identity of the package.
  PACKAGE='powersave'
- VERSION='0.12.9'
+ VERSION='0.12.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24508,7 +24508,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by powersave $as_me 0.12.9, which was
+This file was extended by powersave $as_me 0.12.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24571,7 +24571,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-powersave config.status 0.12.9
+powersave config.status 0.12.10
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/configure.ac new/powersave-0.12.10/configure.ac
--- old/powersave-0.12.9/configure.ac	2006-03-28 16:26:27.000000000 +0200
+++ new/powersave-0.12.10/configure.ac	2006-04-05 12:10:02.000000000 +0200
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT(powersave, 0.12.9, hmacht@suse.de)
+AC_INIT(powersave, 0.12.10, hmacht@suse.de)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([daemon/powersaved.cpp])
 AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/contrib/acpi_hotkeys_ASUS_M6842NW new/powersave-0.12.10/contrib/acpi_hotkeys_ASUS_M6842NW
--- old/powersave-0.12.9/contrib/acpi_hotkeys_ASUS_M6842NW	2006-03-27 18:39:02.000000000 +0200
+++ new/powersave-0.12.10/contrib/acpi_hotkeys_ASUS_M6842NW	2006-04-03 23:00:04.000000000 +0200
@@ -80,7 +80,7 @@
     run_on_xserver "/opt/kde3/bin/dcop kaffeine KaffeineIface stop" &
     : # kaffeine is running, press stop
   else
-    eject /dev/dvdrecorder
+    eject /dev/hdc
     : # kaffeine is not running, eject CD/DVD
   fi
   : # stop
@@ -89,7 +89,7 @@
     run_on_xserver "/opt/kde3/bin/dcop kaffeine KaffeineIface pause" &
     : # play button in kaffeine
   else
-    media=`cd-info --no-tracks --no-cddb --no-device-info --dvd --no-header 2>/dev/null | grep "Disc mode is listed as:" | awk -F ": " '{print $2}'`
+    media=`cd-info --no-tracks --no-cddb --no-device-info --dvd --no-header --cdrom-device=/dev/hdc 2>/dev/null | grep "Disc mode is listed as:" | awk -F ": " '{print $2}'`
     case "$media" in
       CD-DA)
         run_on_xserver "/opt/kde3/bin/kaffeine AudioCD >/dev/null 2>&1"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/daemon/cpufreq_kernel.cpp new/powersave-0.12.10/daemon/cpufreq_kernel.cpp
--- old/powersave-0.12.9/daemon/cpufreq_kernel.cpp	2006-03-28 16:21:29.000000000 +0200
+++ new/powersave-0.12.10/daemon/cpufreq_kernel.cpp	2006-04-03 23:00:05.000000000 +0200
@@ -61,7 +61,7 @@
 	float ratio = 0, tmp_ratio = 0;
 
 	cpufreq_available_frequencies *freqs = cpufreq_get_available_frequencies(_cpu_base);
-	if (freqs == NULL && freqs->next != NULL) {
+	if (freqs == NULL) {
 		return false;
 	}
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/docs/powersave.8 new/powersave-0.12.10/docs/powersave.8
--- old/powersave-0.12.9/docs/powersave.8	2006-03-28 16:29:12.000000000 +0200
+++ new/powersave-0.12.10/docs/powersave.8	2006-04-05 12:11:47.000000000 +0200
@@ -126,7 +126,7 @@
 List all power schemes. Also shows which one is the current active one
 and which are activated if power source changes to AC or battery power.
 Configuration files for schemes are by default
-located in /usr/local/etc/powersave/scheme_*. A scheme
+located in /etc/powersave/scheme_*. A scheme
 changes the power save policy of the powersave daemon. Changing the
 power source (AC/Battery) normally switches the power policy/scheme. Use -e option
 to switch between schemes manually.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/docs/powersaved.8 new/powersave-0.12.10/docs/powersaved.8
--- old/powersave-0.12.9/docs/powersaved.8	2006-03-28 16:29:12.000000000 +0200
+++ new/powersave-0.12.10/docs/powersaved.8	2006-04-05 12:11:47.000000000 +0200
@@ -29,12 +29,12 @@
 .TP
 .I -x
 Set the path to executables that will be executed depending on the
-events configuration file (default: /usr/local/libexec/powersave/scripts)
+events configuration file (default: /usr/lib/powersave/scripts)
 
 .TP
 .I -y
 Set the path to executables that will be executed for internal events
-and by the event scripts (default: /usr/local/libexec/powersave)
+and by the event scripts (default: /usr/lib/powersave)
 
 .TP
 .I -d
@@ -50,7 +50,7 @@
 
 .TP
 .I -c DIR
-Sets the configuration directory (default /usr/local/etc/powersave).
+Sets the configuration directory (default /etc/powersave).
 General configuration files are:
   battery
   common
@@ -63,7 +63,7 @@
 .TP
 .I -s DIR
 Setcs the directory for Scheme configuration files (new ones could be
-added and switched to, default is /usr/local/etc/powersave):
+added and switched to, default is /etc/powersave):
   scheme_acoustic
   scheme_performance   (default scheme when working on AC power)
   scheme_powersave     (default scheme when working on battery power)
@@ -121,7 +121,7 @@
 developers who helped to create this software.
 .SH SEE ALSO
 .B powersave(8)
-.B /usr/local/etc/powersave/*
-.B NONE/share/doc/packages/powersave
+.B /etc/powersave/*
+.B /usr/share/doc/packages/powersave
 .B http://powersave.sourceforge.net
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/scripts/do_acpi_sleep new/powersave-0.12.10/scripts/do_acpi_sleep
--- old/powersave-0.12.9/scripts/do_acpi_sleep	2006-03-27 18:38:56.000000000 +0200
+++ new/powersave-0.12.10/scripts/do_acpi_sleep	2006-04-05 11:38:26.000000000 +0200
@@ -40,6 +40,9 @@
 See http://en.opensuse.org/S2ram for more information.
 Thanks!"
 
+S2RAM_FB_ONLY="Suspend to RAM on this machine only works if no framebuffer is used.
+Change your bootloader configuration to use text mode (vga=0) and reboot."
+
 if [ -z "$1" ];then
     echo "This script is invoked by the powersave daemon, do not invoke from console"
     exit 126
@@ -100,9 +103,10 @@
 		echo "Executing '$S2RAM $S2RAM_OPTS'" >> $S2RAM_LOG
 		$S2RAM $S2RAM_OPTS >> $S2RAM_LOG 2>&1
 		RET=$?
-		if [ $RET = 127 ]; then
-		    $NOTIFY $S2RAM_NOT_SUPPORTED &
-		fi
+		case $RET in
+			127) $NOTIFY $S2RAM_NOT_SUPPORTED & ;;
+			126) $NOTIFY $S2RAM_FB_ONLY & ;;
+		esac
 	else
 		echo "$S2RAM not found, falling back to echo." >> $S2RAM_LOG
 		$MYECHO /sys/power/state mem
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/scripts/rcpowersaved new/powersave-0.12.10/scripts/rcpowersaved
--- old/powersave-0.12.9/scripts/rcpowersaved	2006-03-28 16:29:11.000000000 +0200
+++ new/powersave-0.12.10/scripts/rcpowersaved	2006-04-05 12:11:46.000000000 +0200
@@ -56,7 +56,7 @@
 
 # Check for missing binaries (stale symlinks should not happen)
 powersaved_BIN=/usr/sbin/powersaved
-powersave_BIN=/usr/local/bin/powersave
+powersave_BIN=/usr/bin/powersave
 ACPID_BIN=/sbin/acpid
 S2RAM_BIN=/usr/sbin/s2ram
 # this is the default set of acpi modules loaded if nothing is configured
@@ -65,7 +65,7 @@
 test -x $powersaved_BIN || exit 5
 # Check for existence of needed config file and read it
 
-CONFIG=/usr/local/etc/powersave
+CONFIG=/etc/powersave
 
 # create symlink to /etc where powersave expects configuration files.
 # this is an evil hack and is only needed when updating from powersave
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.9/scripts/setDefaultTrippoints.sh new/powersave-0.12.10/scripts/setDefaultTrippoints.sh
--- old/powersave-0.12.9/scripts/setDefaultTrippoints.sh	2006-03-28 16:29:12.000000000 +0200
+++ new/powersave-0.12.10/scripts/setDefaultTrippoints.sh	2006-04-05 12:11:46.000000000 +0200
@@ -66,13 +66,13 @@
 
 if [ -d /dev/shm ] && [ -w /dev/shm ] && [ -x /dev/shm ];then
     THERMAL_TRIPPOINTS_FILE="/dev/shm/thermal_trippoints_file"
-    /usr/local/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
+    /usr/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
     if [ $? != 0 ];then
 	exit 1
     fi
 elif [ -d /tmp ] && [ -w /tmp ] && [ -x /tmp ];then
     THERMAL_TRIPPOINTS_FILE="/tmp/thermal_trippoints_file"
-    /usr/local/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
+    /usr/bin/powersave -T > $THERMAL_TRIPPOINTS_FILE
     if [ $? != 0 ];then
 	exit 1
     fi
@@ -82,7 +82,7 @@
 fi
 
 if [ "$CONFIG_FILE" = "" ];then
-    for y in /usr/local/etc/powersave/scheme_*; do
+    for y in /etc/powersave/scheme_*; do
 	if [ ! -w "$y" ];then
 	    echo "Cannot access config file $y"
 	    exit 1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)