Hello community,
here is the log from the commit of package powersave
checked in at Thu Aug 9 21:06:50 CEST 2007.
--------
--- powersave/powersave.changes 2007-07-30 18:10:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/powersave/powersave.changes 2007-08-07 16:26:34.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Aug 7 16:18:21 CEST 2007 - hmacht@suse.de
+
+- remove power-management.pot
+- Don't hardcode path to lidswitch device in HAL. This would not
+ work with machines which don't support ACPI (as e.g. MacBookPro)
+- add option to query and set the CPUFreq governor
+- check if /etc/powersave/sleep is still there on update
+ (novell bug 286695)
+- merge patches powersave-0.15.13-disable-thermal-polling.diff and
+ powersave-dbus-send-path-fix.diff pack into package
+- r3016
+
+-------------------------------------------------------------------
Old:
----
powersave-0.15.13-disable-thermal-polling.diff
powersave-0.15.13.tar.bz2
powersave-dbus-send-path-fix.diff
New:
----
powersave-0.15.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powersave.spec ++++++
--- /var/tmp/diff_new_pack.i13670/_old 2007-08-09 21:05:59.000000000 +0200
+++ /var/tmp/diff_new_pack.i13670/_new 2007-08-09 21:05:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package powersave (Version 0.15.13)
+# spec file for package powersave (Version 0.15.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
BuildRequires: dbus-1-glib-devel gcc-c++ liblazy lynx pkgconfig
URL: http://powersave.sourceforge.net/
Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling
-Version: 0.15.13
-Release: 36
+Version: 0.15.14
+Release: 1
License: GPL v2 only, GPL v2 or later
Group: System/Daemons
Autoreqprov: on
@@ -24,8 +24,6 @@
Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Patch0: powersave-0.15.13-disable-thermal-polling.diff
-Patch1: powersave-dbus-send-path-fix.diff
%package devel
Summary: Files needed for development with the powersave daemon or general powermanagement
Requires: %{name} = %{version}-%{release} dbus-1-devel glibc-devel
@@ -84,8 +82,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch
-%patch1 -p0
%build
autoreconf -fi
@@ -171,6 +167,16 @@
%_libdir/lib*.so*
%changelog
+* Tue Aug 07 2007 - hmacht@suse.de
+- remove power-management.pot
+- Don't hardcode path to lidswitch device in HAL. This would not
+ work with machines which don't support ACPI (as e.g. MacBookPro)
+- add option to query and set the CPUFreq governor
+- check if /etc/powersave/sleep is still there on update
+ (novell bug 286695)
+- merge patches powersave-0.15.13-disable-thermal-polling.diff and
+ powersave-dbus-send-path-fix.diff pack into package
+- r3016
* Mon Jul 30 2007 - thoenig@suse.de
- add patch powersave-dbus-send-path-fix.diff: dbus-send is now
located in /bin
++++++ powersave-0.15.13.tar.bz2 -> powersave-0.15.14.tar.bz2 ++++++
++++ 26882 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/compile new/powersave-0.15.14/compile
--- old/powersave-0.15.13/compile 2007-04-19 13:29:57.000000000 +0200
+++ new/powersave-0.15.14/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/config.h.in new/powersave-0.15.14/config.h.in
--- old/powersave-0.15.13/config.h.in 2007-04-19 13:29:52.000000000 +0200
+++ new/powersave-0.15.14/config.h.in 2007-08-07 16:09:24.000000000 +0200
@@ -200,7 +200,7 @@
/* Define to `int' if does not define. */
#undef pid_t
-/* Define to `unsigned' if does not define. */
+/* Define to `unsigned int' if does not define. */
#undef size_t
/* Define as `fork' if `vfork' does not work. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/configure.ac new/powersave-0.15.14/configure.ac
--- old/powersave-0.15.13/configure.ac 2007-04-19 13:29:35.000000000 +0200
+++ new/powersave-0.15.14/configure.ac 2007-08-07 16:09:07.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
-AC_INIT(powersave, 0.15.13, hmacht@suse.de)
+AC_INIT(powersave, 0.15.14, 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/contrib/Makefile.am new/powersave-0.15.14/contrib/Makefile.am
--- old/powersave-0.15.13/contrib/Makefile.am 2007-04-19 13:29:33.000000000 +0200
+++ new/powersave-0.15.14/contrib/Makefile.am 2007-08-07 16:09:05.000000000 +0200
@@ -10,8 +10,15 @@
vbestate_restore \
video_bios_suspend \
acpi_hotkeys_ASUS_M6842NW \
- README.contrib \
vbestate_save
-EXTRA_DIST = $(contrib_SCRIPTS)
+contrib_DOCS = README.contrib
+
+install-exec-hook:
+ $(INSTALL_PROGRAM) -m 644 -D $(top_builddir)/contrib/README.contrib $(DESTDIR)/$(contribdir)/README.contrib
+
+uninstall-local:
+ rm -f $(DESTDIR)/$(contribdir)/README.contrib
+
+EXTRA_DIST = $(contrib_SCRIPTS) $(contrib_DOCS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/daemon/acpi.cpp new/powersave-0.15.14/daemon/acpi.cpp
--- old/powersave-0.15.13/daemon/acpi.cpp 2007-04-19 13:29:34.000000000 +0200
+++ new/powersave-0.15.14/daemon/acpi.cpp 2007-08-07 16:09:07.000000000 +0200
@@ -184,9 +184,15 @@
} else if (type == "button/lid") {
int state;
+ char **lidswitch;
- liblazy_hal_get_property_bool("/org/freedesktop/Hal/devices/acpi_LID",
- "button.state.value", &state);
+ liblazy_hal_find_device_by_string_match("button.type", "lid", &lidswitch);
+ if (lidswitch == NULL || lidswitch[0] == NULL) {
+ pDebug(DBG_INFO, "No Laptop Lidswitch button found\n");
+ return -1;
+ }
+
+ liblazy_hal_get_property_bool(lidswitch[0], "button.state.value", &state);
if (state == 0) {
pDebug(DBG_INFO, "lid open event occured");
if (!DBus_Server::haveClient())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/docs/powersaved.8 new/powersave-0.15.14/docs/powersaved.8
--- old/powersave-0.15.13/docs/powersaved.8 2007-04-19 13:30:09.000000000 +0200
+++ new/powersave-0.15.14/docs/powersaved.8 2007-08-07 16:09:48.000000000 +0200
@@ -110,6 +110,6 @@
.SH SEE ALSO
.B powersave(8)
.B /usr/local/etc/powersave/*
-.B
+.B /usr/local/share/doc/powersave
.B http://powersave.sourceforge.net
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/INSTALL new/powersave-0.15.14/INSTALL
--- old/powersave-0.15.13/INSTALL 2007-04-19 13:29:57.000000000 +0200
+++ new/powersave-0.15.14/INSTALL 2007-08-07 16:10:42.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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/missing new/powersave-0.15.14/missing
--- old/powersave-0.15.13/missing 2007-04-19 13:29:56.000000000 +0200
+++ new/powersave-0.15.14/missing 2007-08-07 16:09:25.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/scripts/helper_functions new/powersave-0.15.14/scripts/helper_functions
--- old/powersave-0.15.13/scripts/helper_functions 2007-04-19 13:29:32.000000000 +0200
+++ new/powersave-0.15.14/scripts/helper_functions 2007-08-07 16:25:20.000000000 +0200
@@ -251,7 +251,7 @@
return 1;
fi
- $BIN_DIR/dbus-send --system --print-reply \
+ /bin/dbus-send --system --print-reply \
--dest=com.novell.powersave \
/com/novell/powersave/scripts \
com.novell.powersave.scripts.ScriptReturn \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/scripts/powersave-notify new/powersave-0.15.14/scripts/powersave-notify
--- old/powersave-0.15.13/scripts/powersave-notify 2007-04-19 13:29:32.000000000 +0200
+++ new/powersave-0.15.14/scripts/powersave-notify 2007-08-07 16:25:20.000000000 +0200
@@ -21,7 +21,7 @@
# #
###########################################################################
-dbus-send --system --print-reply --dest=com.novell.powersave \
+/bin/dbus-send --system --print-reply --dest=com.novell.powersave \
/com/novell/powersave/scripts \
com.novell.powersave.scripts.ScriptReturn int32:-1 int32:2 \
string:"$*"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/scripts/rcpowersaved new/powersave-0.15.14/scripts/rcpowersaved
--- old/powersave-0.15.13/scripts/rcpowersaved 2007-04-19 13:30:08.000000000 +0200
+++ new/powersave-0.15.14/scripts/rcpowersaved 2007-08-07 16:43:36.000000000 +0200
@@ -136,8 +136,7 @@
if [ "$ACPI_APM" = "ACPI" ]; then
# set thermal polling frequency
# this should be managed by the daemon later
- if [ "$THERMAL_POLLING_FREQUENCY" != "0" ];then
- [ -z "$THERMAL_POLLING_FREQUENCY" ] && THERMAL_POLLING_FREQUENCY=8
+ if [ ! -z "$THERMAL_POLLING_FREQUENCY" ];then
for x in /proc/acpi/thermal_zone/*; do
[ -w $x/polling_frequency ] && echo "$THERMAL_POLLING_FREQUENCY" >$x/polling_frequency
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/scripts/rcpowersaved.in new/powersave-0.15.14/scripts/rcpowersaved.in
--- old/powersave-0.15.13/scripts/rcpowersaved.in 2007-04-19 13:29:32.000000000 +0200
+++ new/powersave-0.15.14/scripts/rcpowersaved.in 2007-08-07 16:24:15.000000000 +0200
@@ -136,8 +136,7 @@
if [ "$ACPI_APM" = "ACPI" ]; then
# set thermal polling frequency
# this should be managed by the daemon later
- if [ "$THERMAL_POLLING_FREQUENCY" != "0" ];then
- [ -z "$THERMAL_POLLING_FREQUENCY" ] && THERMAL_POLLING_FREQUENCY=8
+ if [ ! -z "$THERMAL_POLLING_FREQUENCY" ];then
for x in /proc/acpi/thermal_zone/*; do
[ -w $x/polling_frequency ] && echo "$THERMAL_POLLING_FREQUENCY" >$x/polling_frequency
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/scripts/update_config_files_after_014.sh new/powersave-0.15.14/scripts/update_config_files_after_014.sh
--- old/powersave-0.15.13/scripts/update_config_files_after_014.sh 2007-04-19 13:29:32.000000000 +0200
+++ new/powersave-0.15.14/scripts/update_config_files_after_014.sh 2007-08-07 16:09:01.000000000 +0200
@@ -17,6 +17,11 @@
exit 0
fi
+if [ ! -e $PS_CONF/sleep ]; then
+ # nothing to do...
+ exit 0
+fi
+
MSG="#\n# This setting has been moved to PolicyKit below /etc/PolicyKit/privilege.d/"
. $PS_CONF/sleep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/translations/Makefile.am new/powersave-0.15.14/translations/Makefile.am
--- old/powersave-0.15.13/translations/Makefile.am 2007-04-19 13:29:31.000000000 +0200
+++ new/powersave-0.15.14/translations/Makefile.am 2007-08-07 16:08:57.000000000 +0200
@@ -43,7 +43,7 @@
power-management.zh_TW.po
-EXTRA_DIST = $(locale) power-management.pot
+EXTRA_DIST = $(locale)
install-data-local:
@if test "$(TRANSLATION_DIR)"x != "x" ;then \
@@ -65,6 +65,3 @@
rm -f $(DESTDIR)/$(TRANSLATION_DIR)/$${lang}/LC_MESSAGES/$${file_mo}; \
done; \
fi
-
-messages_merge:
- for f in *.po; do echo -n $f :; msgmerge -U $f power-management.pot; done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.13/user_binary/powersave.cpp new/powersave-0.15.14/user_binary/powersave.cpp
--- old/powersave-0.15.13/user_binary/powersave.cpp 2007-04-19 13:29:31.000000000 +0200
+++ new/powersave-0.15.14/user_binary/powersave.cpp 2007-08-07 16:08:58.000000000 +0200
@@ -48,7 +48,7 @@
static int option = -1;
static int verbose = 0;
-static char schemeName[MAX_PARAM_LENGTH + 1] = "";
+static char buffer[MAX_PARAM_LENGTH + 1] = "";
// toDo: set modes to specification ...
static int BATT_INFO = 0;
@@ -66,6 +66,8 @@
static int DYNAMIC_SPEED = 0;
static int DYNAMIC_PERFORMANCE = 0;
static int GET_PERFORMANCE = 0;
+static int SET_GOVERNOR = 0;
+static int GET_GOVERNOR = 0;
static int SUSPEND_TO_DISK = 0;
static int SUSPEND_TO_RAM = 0;
@@ -131,6 +133,8 @@
" -A, --dynamic-speed set cpufreq to dynamic mode\n"
" -g, --set-dynamic-performance set cpufreq dynamic performance\n"
" -G, --get-dynamic-performance get cpufreq dynamic performance\n"
+ " -o, --set-governor set cpufreq governor\n"
+ " -O, --get-governor get cpufreq governor\n"
" -c, --cpufreq-state-info print out the current cpufreq policy\n\n"
" Throttling:\n"
" -p <x>, --set-throttling-percent <x> throttles processors of machine by X percent\n"
@@ -189,6 +193,8 @@
{"dynamic-speed", 0, 0, 'A'},
{"set-dynamic-performance", 1, 0, 'g'},
{"get-dynamic-performance", 0, 0, 'G'},
+ {"set-governor", 1, 0, 'o'},
+ {"get-governor", 0, 0, 'O'},
{"cpufreq-state-info", 0, 0, 'c'},
{"apm-acpi", 0, 0, 'S'},
{"throttling-info", 0, 0, 't'},
@@ -215,7 +221,7 @@
{NULL, 0, 0, 0},
};
while (1) {
- int i = getopt_long(argc, argv, "v:p:e:cbBSaTFVxuUmhtlfAg:Gk:KLX:D:E:", opts, &option_index);
+ int i = getopt_long(argc, argv, "v:p:e:cbBSaTFVxuUmhtlfAg:Go:Ok:KLX:D:E:", opts, &option_index);
if (argc <= 1) {
usage();
exit(0);
@@ -275,6 +281,13 @@
case 'G':
GET_PERFORMANCE = 1;
break;
+ case 'o':
+ SET_GOVERNOR = 1;
+ strcpy(buffer, optarg);
+ break;
+ case 'O':
+ GET_GOVERNOR = 1;
+ break;
case 'U':
SUSPEND_TO_DISK = 1;
break;
@@ -286,14 +299,14 @@
break;
case 'e':
SET_ACTIVE_SCHEME = 1;
- strcpy(schemeName, optarg);
+ strcpy(buffer, optarg);
break;
case 'x':
LIST_SCHEMES = 1;
break;
case 'X':
GET_SCHEME_DESCRIPTION = 1;
- strcpy(schemeName, optarg);
+ strcpy(buffer, optarg);
break;
case 'F':
FAN_INFO = 1;
@@ -757,6 +770,34 @@
fprintf(stderr, "Could not get performance for current governor.\n");
ret = -1;
}
+ } else if (SET_GOVERNOR) {
+ char *gov = buffer;
+ if (liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE,
+ HAL_UDI_COMPUTER,
+ DBUS_HAL_CPUFREQ_INTERFACE,
+ "SetCPUFreqGovernor",
+ &reply,
+ DBUS_TYPE_STRING,
+ &gov,
+ DBUS_TYPE_INVALID)) {
+ fprintf(stderr, "Could not set CPUFreq governor to %s.\n", buffer);
+ ret = -1;
+ } else
+ printf("CPUFreq governor set to %s\n", gov);
+ } else if (GET_GOVERNOR) {
+ char *gov;
+ if (!liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE,
+ HAL_UDI_COMPUTER,
+ DBUS_HAL_CPUFREQ_INTERFACE,
+ "GetCPUFreqGovernor",
+ &reply,
+ DBUS_TYPE_INVALID)
+ && !liblazy_dbus_message_get_basic_arg(reply, DBUS_TYPE_STRING, &gov, 0)) {
+ printf("Current CPUFreq governor: %s\n", gov);
+ } else {
+ fprintf(stderr, "Could not get current CPUFreq governor.\n");
+ ret = -1;
+ }
}
if (CPUFREQ_INFO) {
char *governor = NULL;
@@ -786,10 +827,10 @@
}
}
if (SET_ACTIVE_SCHEME) {
- if (strlen(schemeName) != 0) {
- dummy = schemeName;
+ if (strlen(buffer) != 0) {
+ dummy = buffer;
- if (!strcmp(schemeName, "AdvancedPowersave")) {
+ if (!strcmp(buffer, "AdvancedPowersave")) {
int a;
fprintf(stdout, "About to activate AdvancedPowersave scheme. This scheme "
"is highly experimental. Really activate it? (y/n) ");
@@ -816,13 +857,13 @@
switch (err_code) {
case REPLY_SUCCESS:
- printf("Scheme %s successfully activated\n", schemeName);
+ printf("Scheme %s successfully activated\n", buffer);
break;
case REPLY_ALREADY_SET:
- printf("Scheme %s already active\n", schemeName);
+ printf("Scheme %s already active\n", buffer);
break;
case REPLY_INVALID_PARAM:
- printf("Scheme %s does not exist\n", schemeName);
+ printf("Scheme %s does not exist\n", buffer);
ret = -1;
break;
case REPLY_NO_RIGHTS:
@@ -879,7 +920,7 @@
}
}
if (GET_SCHEME_DESCRIPTION) {
- dummy = schemeName;
+ dummy = buffer;
char *description;
err_code = liblazy_dbus_system_send_method_call(PS_DBUS_SERVICE,
@@ -895,7 +936,7 @@
switch (err_code) {
case REPLY_INVALID_PARAM:
- printf("Error: Scheme %s does not exist\n", schemeName);
+ printf("Error: Scheme %s does not exist\n", buffer);
ret = -1;
break;
case REPLY_SUCCESS:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org